=== Applying patches on top of PostgreSQL commit ID 72e6184cd5fe82620693a2aae9e34452d1984459 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 13 09:44:24 UTC 2026 On branch cf/6177 nothing to commit, working tree clean === using 'git am' to apply patch ./v8-0001-Add-archive_mode-shared-for-coordinated-WAL-archi.patch === 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 error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Add archive_mode=shared for coordinated WAL archiving When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v8-0001-Add-archive_mode-shared-for-coordinated-WAL-archi.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 4061 (offset 13 lines). patching file doc/src/sgml/high-availability.sgml patching file doc/src/sgml/protocol.sgml patching file src/backend/access/transam/xlog.c patching file src/backend/access/transam/xlogarchive.c Hunk #1 succeeded at 575 (offset 1 line). patching file src/backend/commands/subscriptioncmds.c Hunk #1 succeeded at 969 (offset 16 lines). Hunk #2 FAILED at 1117. Hunk #3 FAILED at 1370. Hunk #4 FAILED at 2417. Hunk #5 succeeded at 2815 (offset 45 lines). 3 out of 5 hunks FAILED -- saving rejects to file src/backend/commands/subscriptioncmds.c.rej patching file src/backend/postmaster/pgarch.c patching file src/backend/replication/libpqwalreceiver/libpqwalreceiver.c Hunk #2 succeeded at 148 (offset 1 line). Hunk #3 succeeded at 218 (offset 1 line). patching file src/backend/replication/logical/sequencesync.c Hunk #1 FAILED at 806. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/logical/sequencesync.c.rej patching file src/backend/replication/logical/slotsync.c Hunk #1 succeeded at 1737 (offset 36 lines). patching file src/backend/replication/logical/tablesync.c Hunk #1 FAILED at 1306. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/logical/tablesync.c.rej patching file src/backend/replication/logical/worker.c Hunk #1 FAILED at 5719. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/replication/logical/worker.c.rej patching file src/backend/replication/slotfuncs.c Hunk #1 succeeded at 953 (offset 9 lines). patching file src/backend/replication/walreceiver.c Hunk #1 succeeded at 70 (offset 1 line). Hunk #2 succeeded at 78 (offset 1 line). Hunk #3 succeeded at 136 (offset 1 line). Hunk #4 succeeded at 160 (offset 1 line). Hunk #5 succeeded at 300 (offset 3 lines). Hunk #6 succeeded at 930 (offset 70 lines). Hunk #7 succeeded at 983 (offset 70 lines). Hunk #8 succeeded at 1212 (offset 70 lines). Hunk #9 succeeded at 1441 (offset 70 lines). patching file src/backend/replication/walsender.c Hunk #4 succeeded at 2856 (offset 2 lines). Hunk #5 succeeded at 4574 (offset 2 lines). patching file src/backend/tcop/backend_startup.c Hunk #1 succeeded at 808 (offset 5 lines). patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 292 (offset 1 line). patching file src/include/access/xlog.h patching file src/include/libpq/protocol.h patching file src/include/postmaster/pgarch.h patching file src/include/replication/walreceiver.h Hunk #2 succeeded at 437 (offset 3 lines). patching file src/include/replication/walsender.h patching file src/interfaces/libpq/fe-connect.c Hunk #2 succeeded at 5120 (offset -2 lines). patching file src/interfaces/libpq/fe-protocol3.c Hunk #1 succeeded at 2527 (offset 14 lines). patching file src/interfaces/libpq/libpq-int.h patching file src/test/recovery/meson.build Hunk #1 FAILED at 63. 1 out of 1 hunk FAILED -- saving rejects to file src/test/recovery/meson.build.rej patching file src/test/recovery/t/055_archive_shared.pl patching file src/test/recovery/t/056_archive_shared_checkpoint.pl Unstaged changes after reset: M doc/src/sgml/config.sgml M doc/src/sgml/high-availability.sgml M doc/src/sgml/protocol.sgml M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogarchive.c M src/backend/commands/subscriptioncmds.c M src/backend/postmaster/pgarch.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/logical/slotsync.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/libpq/protocol.h M src/include/postmaster/pgarch.h M src/include/replication/walreceiver.h M src/include/replication/walsender.h M src/interfaces/libpq/fe-connect.c M src/interfaces/libpq/fe-protocol3.c M src/interfaces/libpq/libpq-int.h Removing src/backend/commands/subscriptioncmds.c.rej Removing src/backend/replication/logical/sequencesync.c.rej Removing src/backend/replication/logical/tablesync.c.rej Removing src/backend/replication/logical/worker.c.rej Removing src/test/recovery/meson.build.rej Removing src/test/recovery/t/055_archive_shared.pl Removing src/test/recovery/t/056_archive_shared_checkpoint.pl === using 'git apply' to apply patch ./v8-0001-Add-archive_mode-shared-for-coordinated-WAL-archi.patch === Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'doc/src/sgml/high-availability.sgml' cleanly. Applied patch to 'doc/src/sgml/protocol.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/access/transam/xlogarchive.c' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' with conflicts. Applied patch to 'src/backend/postmaster/pgarch.c' cleanly. Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. Applied patch to 'src/backend/replication/logical/sequencesync.c' with conflicts. Applied patch to 'src/backend/replication/logical/slotsync.c' cleanly. Applied patch to 'src/backend/replication/logical/tablesync.c' with conflicts. Applied patch to 'src/backend/replication/logical/worker.c' with conflicts. Applied patch to 'src/backend/replication/slotfuncs.c' cleanly. Applied patch to 'src/backend/replication/walreceiver.c' cleanly. Applied patch to 'src/backend/replication/walsender.c' cleanly. Applied patch to 'src/backend/tcop/backend_startup.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/include/access/xlog.h' cleanly. Applied patch to 'src/include/libpq/protocol.h' cleanly. Applied patch to 'src/include/postmaster/pgarch.h' cleanly. Applied patch to 'src/include/replication/walreceiver.h' cleanly. Applied patch to 'src/include/replication/walsender.h' cleanly. Applied patch to 'src/interfaces/libpq/fe-connect.c' cleanly. Applied patch to 'src/interfaces/libpq/fe-protocol3.c' cleanly. Applied patch to 'src/interfaces/libpq/libpq-int.h' cleanly. Applied patch to 'src/test/recovery/meson.build' with conflicts. Falling back to direct application... Falling back to direct application... U src/backend/commands/subscriptioncmds.c U src/backend/replication/logical/sequencesync.c U src/backend/replication/logical/tablesync.c U src/backend/replication/logical/worker.c U src/test/recovery/meson.build diff --cc src/backend/commands/subscriptioncmds.c index 8e8db08bd93,a939defd319..00000000000 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@@ -1140,7 -1117,7 +1140,11 @@@ AlterSubscription_refresh(Subscription /* Try to connect to the publisher. */ must_use_password = sub->passwordrequired && !sub->ownersuperuser; ++<<<<<<< ours + wrconn = walrcv_connect(conninfo, true, true, must_use_password, ++======= + wrconn = walrcv_connect(sub->conninfo, true, true, must_use_password, false, ++>>>>>>> theirs sub->name, &err); if (!wrconn) ereport(ERROR, @@@ -1400,7 -1370,7 +1404,11 @@@ AlterSubscription_refresh_seq(Subscript /* Try to connect to the publisher. */ must_use_password = sub->passwordrequired && !sub->ownersuperuser; ++<<<<<<< ours + wrconn = walrcv_connect(conninfo, true, true, must_use_password, ++======= + wrconn = walrcv_connect(sub->conninfo, true, true, must_use_password, false, ++>>>>>>> theirs sub->name, &err); if (!wrconn) ereport(ERROR, @@@ -2461,8 -2416,8 +2469,13 @@@ AlterSubscription(ParseState *pstate, A * available. */ must_use_password = sub->passwordrequired && !sub->ownersuperuser; ++<<<<<<< ours + wrconn = walrcv_connect(new_conninfo ? new_conninfo : orig_conninfo, + true, true, must_use_password, sub->name, ++======= + wrconn = walrcv_connect(new_conninfo ? new_conninfo : sub->conninfo, + true, true, must_use_password, false, sub->name, ++>>>>>>> theirs &err); if (!wrconn) ereport(ERROR, diff --cc src/backend/replication/logical/sequencesync.c index 6d551d45791,8e6f88354f1..00000000000 --- a/src/backend/replication/logical/sequencesync.c +++ b/src/backend/replication/logical/sequencesync.c @@@ -815,7 -806,7 +815,11 @@@ LogicalRepSyncSequences(void * Establish the connection to the publisher for sequence synchronization. */ LogRepWorkerWalRcvConn = ++<<<<<<< ours + walrcv_connect(MySubscriptionConninfo, true, true, ++======= + walrcv_connect(MySubscription->conninfo, true, true, false, ++>>>>>>> theirs must_use_password, app_name.data, &err); if (LogRepWorkerWalRcvConn == NULL) diff --cc src/backend/replication/logical/tablesync.c index e5101997cd3,693a0c3c814..00000000000 --- a/src/backend/replication/logical/tablesync.c +++ b/src/backend/replication/logical/tablesync.c @@@ -1305,8 -1305,8 +1305,13 @@@ LogicalRepSyncTableStart(XLogRecPtr *or * so that synchronous replication can distinguish them. */ LogRepWorkerWalRcvConn = ++<<<<<<< ours + walrcv_connect(MySubscriptionConninfo, true, true, + must_use_password, ++======= + walrcv_connect(MySubscription->conninfo, true, true, + must_use_password, false, ++>>>>>>> theirs slotname, &err); if (LogRepWorkerWalRcvConn == NULL) ereport(ERROR, diff --cc src/backend/replication/logical/worker.c index 92ea1d0df24,98c522e7390..00000000000 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@@ -5733,8 -5718,8 +5733,13 @@@ run_apply_worker(void must_use_password = MySubscription->passwordrequired && !MySubscription->ownersuperuser; ++<<<<<<< ours + LogRepWorkerWalRcvConn = walrcv_connect(MySubscriptionConninfo, true, + true, must_use_password, ++======= + LogRepWorkerWalRcvConn = walrcv_connect(MySubscription->conninfo, true, + true, must_use_password, false, ++>>>>>>> theirs MySubscription->name, &err); if (LogRepWorkerWalRcvConn == NULL) diff --cc src/test/recovery/meson.build index 39ec8c4946d,7e0c6ba67cc..00000000000 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@@ -63,7 -63,8 +63,12 @@@ tests += 't/052_checkpoint_segment_missing.pl', 't/053_standby_login_event_trigger.pl', 't/054_unlogged_sequence_promotion.pl', ++<<<<<<< ours + 't/055_cascade_reconnect.pl', ++======= + 't/055_archive_shared.pl', + 't/056_archive_shared_checkpoint.pl', ++>>>>>>> theirs ], }, }