Fix archive restore race that could unlink WAL before rename

back to CI dashboard

2 patchsets tracked - current t253186_3

v3t253186_3posted Aug 04, 14:47successwon't retryrecent 18dpg 20
basefd2b89854 Aug 05, 09:40 on master
applyapplied Aug 05, 14:50
rebaselast tried Aug 05, 14:50 on fd2b89854
pushAug 05, 14:50 -> b29f2346fbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201019 / 10192m 53s / 5m 32sdocker run ... :t253186Aug 05, 15:01
run 31017246391
executed 1019 - ccache 166 hit / 6452 miss - head b29f2346f - digest sha256:9d2eb7d1b7d6c7... - run 31017246391
success1201019 / 10192m 24s / 4m 27sdocker run ... @sha256:057c0a4...Aug 04, 14:59
run 30920906589
executed 1019 - ccache 166 hit / 6452 miss - head 3f84ced6a - digest sha256:057c0a488da2b4... - run 30920906589
v1t253186_1posted Jul 24, 15:29successsupersededrecent 25dpg 20
base239eabda4 Jul 28, 20:09 on master
applyapplied Jul 28, 21:43
rebaselast tried Aug 03, 21:51 on 824d5f624
Applying: Fix archive restore race that could unlink WAL before rename.
Using index info to reconstruct a base tree...
M	src/test/recovery/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/meson.build
CONFLICT (content): Merge conflict in src/test/recovery/meson.build
Patch failed at 0001 Fix archive restore race that could unlink WAL before rename.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/test/recovery/meson.build
pushJul 28, 21:44 -> c9b5074cabranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201016 / 10162m 46s / 5m 27sdocker run ... @sha256:e133f41...Jul 28, 22:05
run 30401856418
executed 1016 - ccache 166 hit / 6452 miss - head c9b5074ca - digest sha256:e133f41a4ebde8... - run 30401856418