[PATCH] Prevent repeated deadlock-check signals in standby buffer pin waits
1 patchset tracked - current t139380_10
v10t139380_10posted Jun 03, 08:27successwon't retrystale 3mopg 19
basebec61f593 May 26, 23:27 - 95 days / 867 commits behind master (from history)
applyapplied Jul 28, 14:49
rebaselast tried Jul 28, 14:49 on 8a045f760
Applying: Prevent repeated deadlock-check signals in standby buffer pin waits Using index info to reconstruct a base tree... M src/backend/storage/buffer/bufmgr.c M src/backend/storage/ipc/standby.c M src/test/recovery/meson.build Falling back to patching base and 3-way merge... Auto-merging src/test/recovery/meson.build CONFLICT (content): Merge conflict in src/test/recovery/meson.build Auto-merging src/backend/storage/ipc/standby.c Auto-merging src/backend/storage/buffer/bufmgr.c Patch failed at 0001 Prevent repeated deadlock-check signals in standby buffer pin waits 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/test/recovery/meson.build
pushJul 28, 14:49 -> b52052534branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1005 / 1005 | 2m 50s / 5m 23s | docker run ... :t139380 | Jul 28, 15:03 |
run 30370311885executed 1005 - ccache 145 hit / 6474 miss - head b52052534 - digest sha256:7fb04416212917... - run 30370311885 | ||||||