Fix race condition in SSI when reading PredXact->SxactGlobalXmin

back to CI dashboard

2 patchsets tracked - current t52240_9

v9t52240_9posted Jun 12, 01:04successwon't retrystale 4mopg 19
base36f52a59b May 11, 16:17 - 107 days / 929 commits behind master (from history)
applyapplied Jul 29, 00:22
rebaselast tried Jul 29, 00:22 on dd50eb914
Applying: Fix race condition when reading `PredXact->SxactGlobalXmin`
Using index info to reconstruct a base tree...
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/injection_points/meson.build
CONFLICT (content): Merge conflict in src/test/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
Patch failed at 0001 Fix race condition when reading `PredXact->SxactGlobalXmin`

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/modules/injection_points/meson.build, src/test/modules/injection_points/Makefile
pushJul 29, 00:22 -> 351117093branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1191003 / 10032m 54s / 5m 14sdocker run ... :t52240Jul 29, 00:36
run 30410969617
executed 1003 - ccache 78 hit / 6541 miss - head 351117093 - digest sha256:2e839eb656e0bc... - run 30410969617
v8t52240_8posted Mar 28, 13:07successsupersededstale 5mopg 19
base3fd057772 Mar 27, 11:24 - 152 days / 1442 commits behind master (from history)
applyapplied Jul 26, 07:19
pushJul 27, 02:30 -> a9ba7fd81branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success119972 / 9722m 52s / 5m 06sdocker run ... @sha256:8a231b4...Jul 27, 02:40
run 30232344896
executed 972 - ccache 78 hit / 6522 miss - head a9ba7fd81 - digest sha256:8a231b4e4b2727... - run 30232344896