Requiring recovery.signal or standby.signal when recovering with a backup_label

back to CI dashboard

1 patchset tracked - current t47585_27

v27t47585_27posted Oct 31, 2023successwon't retryancient 3ypg 17
basedc5bd3889 Oct 30, 2023 - 1055 days / 8376 commits behind master (from history)
applyapplied Aug 18, 15:02
rebaselast tried Aug 18, 15:02 on 195e8e427
Applying: Force crash recovery with backup_label and no .signal files
Using index info to reconstruct a base tree...
M	doc/src/sgml/backup.sgml
M	src/backend/access/transam/xlogrecovery.c
M	src/bin/pg_basebackup/t/010_pg_basebackup.pl
Falling back to patching base and 3-way merge...
Auto-merging src/bin/pg_basebackup/t/010_pg_basebackup.pl
CONFLICT (content): Merge conflict in src/bin/pg_basebackup/t/010_pg_basebackup.pl
Auto-merging src/backend/access/transam/xlogrecovery.c
Auto-merging doc/src/sgml/backup.sgml
Patch failed at 0001 Force crash recovery with backup_label and no .signal files

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/bin/pg_basebackup/t/010_pg_basebackup.pl
pushAug 18, 15:02 -> e21299993branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success117785 / 7852m 52s / 3m 11sdocker run ... :t47585Aug 18, 15:13
run 32152006221
executed 785 - ccache 213 hit / 4360 miss - head e21299993 - digest sha256:009fc80b685a9b... - run 32152006221