please update ps display for recovery checkpoint
1 patchset tracked - current t42816_26
v26t42816_26posted Jun 07, 2021successwon't retryancient 5ypg 14
basedef5b065f May 12, 2021 - 1956 days / 13963 commits behind master (from history)
applyapplied Aug 18, 15:54
rebaselast tried Aug 18, 15:54 on 195e8e427
Applying: Show "syncing data directories" in ps display.. Using index info to reconstruct a base tree... M src/backend/storage/file/fd.c Falling back to patching base and 3-way merge... Auto-merging src/backend/storage/file/fd.c CONFLICT (content): Merge conflict in src/backend/storage/file/fd.c Patch failed at 0001 Show "syncing data directories" in ps display.. 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/storage/file/fd.c
pushAug 18, 15:54 -> fd4cfd37abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 14 | 622 / 622 | 2m 23s / 3m 19s | docker run ... :t42816 | Aug 18, 16:04 |
run 32157294455executed 622 - ccache 128 hit / 4246 miss - head fd4cfd37a - digest sha256:c269593c8394cf... - run 32157294455 | ||||||