odd buildfarm failure - "pg_ctl: control file appears to be corrupt"
1 patchset tracked - current t46988_40
v40t46988_40posted Oct 16, 2023successwon't retryancient 3ypg 17
base63a582222 Oct 16, 2023 - 1070 days / 8470 commits behind master (from history)
applyapplied Aug 18, 15:04
rebaselast tried Aug 18, 15:04 on 195e8e427
Applying: Acquire ControlFileLock in base backups. Using index info to reconstruct a base tree... M src/backend/backup/basebackup.c Falling back to patching base and 3-way merge... Auto-merging src/backend/backup/basebackup.c CONFLICT (content): Merge conflict in src/backend/backup/basebackup.c Patch failed at 0001 Acquire ControlFileLock in base backups. 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/backend/backup/basebackup.c
pushAug 18, 15:04 -> cbc20e017branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 17 | 782 / 782 | 2m 54s / 3m 27s | docker run ... :t46988 | Aug 18, 15:14 |
run 32152238544executed 782 - ccache 213 hit / 4360 miss - head cbc20e017 - digest sha256:65ed73c34f310a... - run 32152238544 | ||||||