Error while creating subscription when server is running in single user mode
1 patchset tracked - current t36821_18
v18t36821_18posted Jun 06, 2017successwon't retryancient 9ypg 10
basee3a815d2f Jun 06, 2017 - 3392 days / 22584 commits behind master (from history)
applyapplied Aug 18, 16:59
rebaselast tried Aug 18, 16:59 on 195e8e427
Applying: Clean up latch related code. Using index info to reconstruct a base tree... M src/backend/access/transam/parallel.c M src/backend/libpq/pqmq.c M src/backend/postmaster/bgworker.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.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/storage/lmgr/condition_variable.c M src/test/modules/worker_spi/worker_spi.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/worker_spi/worker_spi.c Auto-merging src/backend/storage/lmgr/condition_variable.c CONFLICT (content): Merge conflict in src/backend/storage/lmgr/condition_variable.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/replication/libpqwalreceiver/libpqwalreceiver.c CONFLICT (content): Merge conflict in src/backend/replication/libpqwalreceiver/libpqwalreceiver.c Auto-merging src/backend/postmaster/bgworker.c Auto-merging src/backend/libpq/pqmq.c CONFLICT (content): Merge conflict in src/backend/libpq/pqmq.c Auto-merging src/backend/access/transam/parallel.c CONFLICT (content): Merge conflict in src/backend/access/transam/parallel.c Patch failed at 0001 Clean up latch related code. 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/lmgr/condition_variable.c, src/backend/replication/logical/worker.c, src/backend/replication/logical/tablesync.c, src/backend/replication/logical/launcher.c, src/backend/replication/libpqwalreceiver/libpqwalreceiver.c, src/backend/libpq/pqmq.c, src/backend/access/transam/parallel.c
pushAug 18, 16:59 -> 516063db6branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 10 | 451 / 451 | 1m 53s / 5m 49s | docker run ... :t36821 | Aug 18, 17:12 |
run 32163231712executed 451 - ccache 49 hit / 4930 miss - head 516063db6 - digest sha256:16f055ba9a7a82... - run 32163231712 | ||||||