Re: BUG #19776: pg_combinebackup ignores the truncation_block_length of an intermediate incremental backup
2 patchsets tracked - current t254429_2
v2t254429_2posted 4 days agosuccessappliesrecent 0dpg 20
base73a28d273 about 12 hours ago on master
applyapplied about 10 hours ago
rebaselast tried about 10 hours ago on 73a28d273
pushabout 10 hours ago -> e4f233686branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1052 / 1052 | 3m 01s / 5m 35s | docker run ... :t254429 | about 10 hours ago |
run 41819480749executed 1052 - ccache 78 hit / 6546 miss - head e4f233686 - digest sha256:a91fb7e853d43d... - run 41819480749 | ||||||
| success | 1 | 20 | 1052 / 1052 | 3m 04s / 5m 37s | docker run ... @sha256:d6d0d05... | 1 day ago |
run 41625277874executed 1052 - ccache 78 hit / 6544 miss - head f834a3564 - digest sha256:d6d0d05612313b... - run 41625277874 | ||||||
| success | 1 | 20 | 1052 / 1052 | 2m 46s / 4m 58s | docker run ... @sha256:800825e... | 2 days ago |
run 41433965267executed 1052 - ccache 78 hit / 6544 miss - head 6af3bc4e9 - digest sha256:800825eab89636... - run 41433965267 | ||||||
v1t254429_1posted Oct 28, 13:16successsupersededstale 4mopg 19
base994f770a0 Jun 29, 10:29 - 128 days / 1270 commits behind master (from history)
applyapplied Oct 28, 16:27
rebaselast tried Oct 28, 16:27 on 4848fd675
Applying: Fix pg_combinebackup with truncated intermediate backups. Using index info to reconstruct a base tree... M src/bin/pg_combinebackup/reconstruct.c Falling back to patching base and 3-way merge... Auto-merging src/bin/pg_combinebackup/reconstruct.c CONFLICT (content): Merge conflict in src/bin/pg_combinebackup/reconstruct.c Patch failed at 0001 Fix pg_combinebackup with truncated intermediate 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/bin/pg_combinebackup/reconstruct.c
pushOct 28, 16:28 -> 9f706da0ebranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1005 / 1005 | 3m 06s / 5m 37s | docker run ... @sha256:a3b6f21... | Oct 28, 16:39 |
run 40726237092executed 1005 - ccache 145 hit / 6474 miss - head 9f706da0e - digest sha256:a3b6f21ce42f3c... - run 40726237092 | ||||||