ReplicationSlotRelease() clobbers another backend's statusFlags entry

back to CI dashboard

2 patchsets tracked - current t253966_3

v3t253966_3posted Sep 29, 16:22successwon't retryrecent 23dpg 20
basedca6a9e32 Sep 29, 15:11 on master
applyapplied Sep 29, 16:25
rebaselast tried Sep 29, 16:25 on dca6a9e32
pushSep 29, 16:25 -> d213b3a2ebranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201040 / 10402m 56s / 5m 39sdocker run ... :t253966Sep 29, 16:36
run 36597607694
executed 1040 - ccache 78 hit / 6544 miss - head d213b3a2e - digest sha256:43a5600837d620... - run 36597607694
v1t253966_1posted Sep 28, 09:54successsupersededrecent 29dpg 20
base374522aa6 Sep 23, 13:18 - 29 days / 271 commits behind master (from base line)
applyapplied Sep 28, 09:57
rebaselast tried Sep 29, 09:58 on 6a9353579
Applying: Fix clobbering of shared statusFlags when a slot is invalidated
Using index info to reconstruct a base tree...
M	src/include/miscadmin.h
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
Auto-merging src/include/miscadmin.h
Patch failed at 0001 Fix clobbering of shared statusFlags when a slot is invalidated

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
pushSep 28, 09:57 -> 3071a8ccebranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201037 / 10372m 51s / 5m 18sdocker run ... @sha256:dbaaf6e...Sep 28, 10:08
run 36406739541
executed 1037 - ccache 98 hit / 6524 miss - head 3071a8cce - digest sha256:dbaaf6e8c58dc6... - run 36406739541