Add recovery to pg_control and remove backup_label

back to CI dashboard

1 patchset tracked - current t48649_15

v15t48649_15posted Nov 20, 2023successwon't retryancient 3ypg 17
base025584a16 Nov 14, 2023 - 1040 days / 8264 commits behind master (from history)
applyapplied Aug 18, 15:01
rebaselast tried Aug 18, 15:01 on 195e8e427
Applying: Add label and start/stop time to backup manifest.
Using index info to reconstruct a base tree...
M	doc/src/sgml/backup-manifest.sgml
M	src/backend/backup/backup_manifest.c
M	src/backend/backup/basebackup.c
A	src/bin/pg_verifybackup/parse_manifest.c
M	src/include/backup/backup_manifest.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/backup/backup_manifest.h
Auto-merging src/common/parse_manifest.c
CONFLICT (content): Merge conflict in src/common/parse_manifest.c
Auto-merging src/backend/backup/basebackup.c
Auto-merging src/backend/backup/backup_manifest.c
CONFLICT (content): Merge conflict in src/backend/backup/backup_manifest.c
Auto-merging doc/src/sgml/backup-manifest.sgml
Patch failed at 0001 Add label and start/stop time to backup manifest.

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/common/parse_manifest.c, src/backend/backup/backup_manifest.c
pushAug 18, 15:01 -> 4f5d08acabranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success117787 / 7872m 52s / 3m 35sdocker run ... :t48649Aug 18, 15:13
run 32151977507
executed 787 - ccache 213 hit / 4365 miss - head 4f5d08aca - digest sha256:891aa5ac3e63c7... - run 32151977507