suppressing useless wakeups in logical/worker.c

back to CI dashboard

1 patchset tracked - current t47041_22

v22t47041_22posted Mar 17, 2023successwon't retryancient 4ypg 16
basee731aeac8 Mar 16, 2023 - 1283 days / 9707 commits behind master (from history)
applyapplied Aug 18, 15:16
rebaselast tried Aug 18, 15:16 on 195e8e427
Applying: suppress useless wakeups in logical/worker.c
Using index info to reconstruct a base tree...
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/include/replication/worker_internal.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/include/replication/worker_internal.h
CONFLICT (content): Merge conflict in src/include/replication/worker_internal.h
Auto-merging src/backend/replication/logical/worker.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/worker.c
Auto-merging src/backend/replication/logical/tablesync.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/tablesync.c
Patch failed at 0001 suppress useless wakeups in logical/worker.c

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/include/replication/worker_internal.h, src/backend/replication/logical/worker.c, src/backend/replication/logical/tablesync.c
pushAug 18, 15:16 -> cf2689685branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success116683 / 6832m 02s / 6m 05sdocker run ... :t47041Aug 18, 15:28
run 32153501647
executed 683 - ccache 419 hit / 4147 miss - head cf2689685 - digest sha256:0fa4bec3dcdc16... - run 32153501647