Streaming replication and WAL archive interactions

3 patchsets tracked - current t32178_41

v41t32178_41posted Jul 30, 14:44tests timeoutneeds rebaserecent 28dpg 20

baseb8d9cf512 Jul 27, 03:36 - 28 days / 304 commits behind master (from history)

applyapplied Jul 30, 14:46

rebaselast tried about 20 hours ago on f20c42783

Applying: Add archive_mode=shared for coordinated WAL archiving
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/access/transam/xlog.c
M	src/backend/access/transam/xlogarchive.c
M	src/backend/commands/subscriptioncmds.c
M	src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
M	src/backend/replication/logical/sequencesync.c
M	src/backend/replication/logical/slotsync.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/backend/replication/slotfuncs.c
M	src/backend/replication/walreceiver.c
M	src/backend/replication/walsender.c
M	src/backend/tcop/backend_startup.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/access/xlog.h
M	src/include/replication/walreceiver.h
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-protocol3.c
M	src/interfaces/libpq/libpq-int.h
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/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/fe-protocol3.c
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/include/replication/walreceiver.h
Auto-merging src/include/access/xlog.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/tcop/backend_startup.c
Auto-merging src/backend/replication/walsender.c
Auto-merging src/backend/replication/walreceiver.c
Auto-merging src/backend/replication/slotfuncs.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/slotsync.c
Auto-merging src/backend/replication/logical/sequencesync.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/sequencesync.c
Auto-merging src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Auto-merging src/backend/access/transam/xlogarchive.c
Auto-merging src/backend/access/transam/xlog.c
Auto-merging doc/src/sgml/config.sgml
Patch failed at 0001 Add archive_mode=shared for coordinated WAL archiving

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, src/backend/replication/logical/worker.c, src/backend/replication/logical/tablesync.c, src/backend/replication/logical/sequencesync.c, src/backend/commands/subscriptioncmds.c

pushJul 30, 14:46 -> fe74309bb branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
tests timeout	1	20	960 / 960	2m 56s / 20m 00s	`docker run ... :t32178`	Jul 30, 15:13
run 30553390026 executed 960 - ccache 166 hit / 6452 miss - head fe74309bb - digest sha256:bdc7e03309c78e... - run 30553390026

v40t32178_40posted Jul 22, 11:19successsupersededstale 34dpg 20

base99e949f84 Jul 21, 00:11 - 34 days / 336 commits behind master (from history)

applyapplied Jul 28, 22:06

rebaselast tried Jul 29, 22:08 on b43e8f4b3

Applying: fixup! Add archive_mode=shared for coordinated WAL archiving
Using index info to reconstruct a base tree...
M	src/backend/replication/walreceiver.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/replication/walreceiver.c
Patch failed at 0001 fixup! Add archive_mode=shared for coordinated WAL archiving

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, 22:06 -> 739dd7d79 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1012 / 1012	2m 51s / 5m 32s	`docker run ... @sha256:74b6870...`	Jul 28, 22:19
run 30403325092 executed 1012 - ccache 166 hit / 6452 miss - head 739dd7d79 - digest sha256:74b6870591eeff... - run 30403325092

v37t32178_37posted May 03, 22:50successsupersededrecent 26dpg 20

base8a045f760 Jul 28, 08:50 on master

applyapplied Jul 28, 10:11

rebaselast tried Jul 28, 10:11

pushJul 28, 10:11 -> a2df48fc0 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1015 / 1015	2m 49s / 5m 13s	`docker run ... @sha256:43ad674...`	Jul 28, 10:26
run 30349745604 executed 1015 - ccache 166 hit / 6452 miss - head a2df48fc0 - digest sha256:43ad67414c67af... - run 30349745604
success	1	20	1014 / 1014	2m 58s / 5m 21s	`docker run ... @sha256:362591e...`	Jul 27, 01:01
run 30228382660 executed 1014 - ccache 166 hit / 6452 miss - head bc6bc0667 - digest sha256:362591e96a2465... - run 30228382660