needless complexity in StartupXLOG

back to CI dashboard

1 patchset tracked - current t44601_33

v33t44601_33posted Apr 19, 2022successwon't retryancient 4ypg 15
base5a892c9b1 Apr 16, 2022 - 1617 days / 11863 commits behind master (from history)
applyapplied Aug 18, 15:40
rebaselast tried Aug 18, 15:40 on 195e8e427
Applying: Remove the end-of-recovery checkpoint in all cases.
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/backend/postmaster/checkpointer.c
M	src/backend/replication/logical/decode.c
M	src/backend/storage/buffer/bufmgr.c
M	src/include/access/xlog.h
M	src/include/access/xlog_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/access/xlog_internal.h
Auto-merging src/include/access/xlog.h
CONFLICT (content): Merge conflict in src/include/access/xlog.h
Auto-merging src/backend/storage/buffer/bufmgr.c
CONFLICT (content): Merge conflict in src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/replication/logical/decode.c
Auto-merging src/backend/postmaster/checkpointer.c
CONFLICT (content): Merge conflict in src/backend/postmaster/checkpointer.c
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Remove the end-of-recovery checkpoint in all cases.

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/include/access/xlog.h, src/backend/storage/buffer/bufmgr.c, src/backend/postmaster/checkpointer.c, src/backend/access/transam/xlog.c
pushAug 18, 15:40 -> 1afc5ba4cbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success115651 / 6511m 50s / 3m 28sdocker run ... :t44601Aug 18, 15:49
run 32155929738
executed 651 - ccache 84 hit / 4317 miss - head 1afc5ba4c - digest sha256:49dbc84f1dba91... - run 32155929738