Get stuck when dropping a subscription during synchronizing table

back to CI dashboard

1 patchset tracked - current t36652_66

v66t36652_66posted Jun 27, 2017successwon't retryancient 9ypg 10
base382ceffdf Jun 21, 2017 - 3377 days / 22465 commits behind master (from history)
applyapplied Aug 18, 16:58
rebaselast tried Aug 18, 16:58 on 195e8e427
Applying: Rework subscription worker and relation status handling
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/backend/catalog/pg_subscription.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/replication/logical/launcher.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/backend/utils/cache/catcache.c
M	src/include/catalog/pg_subscription_rel.h
M	src/include/replication/logicallauncher.h
M	src/include/replication/worker_internal.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/replication/worker_internal.h
CONFLICT (content): Merge conflict in src/include/replication/worker_internal.h
Auto-merging src/include/replication/logicallauncher.h
CONFLICT (content): Merge conflict in src/include/replication/logicallauncher.h
Auto-merging src/include/catalog/pg_subscription_rel.h
CONFLICT (content): Merge conflict in src/include/catalog/pg_subscription_rel.h
Auto-merging src/backend/utils/cache/catcache.c
CONFLICT (content): Merge conflict in src/backend/utils/cache/catcache.c
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
Auto-merging src/backend/replication/logical/launcher.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/launcher.c
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Auto-merging src/backend/catalog/pg_subscription.c
CONFLICT (content): Merge conflict in src/backend/catalog/pg_subscription.c
Auto-merging src/backend/access/transam/xact.c
Patch failed at 0001 Rework subscription worker and relation status handling

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/include/replication/logicallauncher.h, src/include/catalog/pg_subscription_rel.h, src/backend/utils/cache/catcache.c, src/backend/replication/logical/worker.c, src/backend/replication/logical/tablesync.c, src/backend/replication/logical/launcher.c, src/backend/commands/subscriptioncmds.c, src/backend/catalog/pg_subscription.c
pushAug 18, 16:59 -> f58055effbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success110451 / 4511m 43s / 5m 44sdocker run ... :t36652Aug 18, 17:12
run 32163193422
executed 451 - ccache 48 hit / 4930 miss - head f58055eff - digest sha256:1b02b26ebd05ae... - run 32163193422