=== Applying patches on top of PostgreSQL commit ID 2f04110225ab30fbd9889d6f5d73fd6b3e1b308b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Dec 5 07:55:22 UTC 2025 On branch cf/6019 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch === Applying: Implement batching for WAL records notification during cascade replication .git/rebase-apply/patch:317: tab in indent. # before cascade logical walsenders are notified on standby .git/rebase-apply/patch:318: tab in indent. # 1 disables records batching in cascade replication .git/rebase-apply/patch:320: tab in indent. # are notified about applied records if batching is enabled .git/rebase-apply/patch:321: tab in indent. # (i.e. if cascade_replication_batch_size is greater than 1) .git/rebase-apply/patch:322: tab in indent. # 0 disables timed notifications during batching warning: 5 lines add whitespace errors. Using index info to reconstruct a base tree... M doc/src/sgml/config.sgml M src/backend/access/transam/xlogrecovery.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/misc/postgresql.conf.sample CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/access/transam/xlogrecovery.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 Implement batching for WAL records notification during cascade replication 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". Unstaged changes after reset: M doc/src/sgml/config.sgml M src/backend/access/transam/xlogrecovery.c M src/backend/postmaster/startup.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/access/xlogrecovery.h M src/include/utils/guc_hooks.h M src/include/utils/timeout.h === using patch(1) to apply patch ./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch === patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 5300 (offset 13 lines). patching file src/backend/access/transam/xlogrecovery.c patching file src/backend/postmaster/startup.c patching file src/backend/utils/misc/guc_parameters.dat patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 FAILED at 376. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej patching file src/include/access/xlogrecovery.h patching file src/include/utils/guc_hooks.h patching file src/include/utils/timeout.h Unstaged changes after reset: M doc/src/sgml/config.sgml M src/backend/access/transam/xlogrecovery.c M src/backend/postmaster/startup.c M src/backend/utils/misc/guc_parameters.dat M src/include/access/xlogrecovery.h M src/include/utils/guc_hooks.h M src/include/utils/timeout.h Removing src/backend/utils/misc/postgresql.conf.sample.rej === using 'git apply' to apply patch ./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch === /work/patches/./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch:331: tab in indent. # before cascade logical walsenders are notified on standby /work/patches/./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch:332: tab in indent. # 1 disables records batching in cascade replication /work/patches/./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch:334: tab in indent. # are notified about applied records if batching is enabled /work/patches/./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch:335: tab in indent. # (i.e. if cascade_replication_batch_size is greater than 1) /work/patches/./v3-0001-Implement-batching-for-WAL-records-notification-duri.patch:336: tab in indent. # 0 disables timed notifications during batching Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/backend/postmaster/startup.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' with conflicts. Applied patch to 'src/include/access/xlogrecovery.h' cleanly. Applied patch to 'src/include/utils/guc_hooks.h' cleanly. Applied patch to 'src/include/utils/timeout.h' cleanly. U src/backend/utils/misc/postgresql.conf.sample warning: 5 lines add whitespace errors. diff --cc src/backend/utils/misc/postgresql.conf.sample index dc9e2255f8a,2f41c751880..00000000000 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@@ -362,29 -362,36 +362,62 @@@ # These settings are ignored on a primary server. ++<<<<<<< ours +#primary_conninfo = '' # connection string to sending server +#primary_slot_name = '' # replication slot on sending server +#hot_standby = on # "off" disallows queries during recovery + # (change requires restart) +#max_standby_archive_delay = 30s # max delay before canceling queries + # when reading WAL from archive; + # -1 allows indefinite delay +#max_standby_streaming_delay = 30s # max delay before canceling queries + # when reading streaming WAL; + # -1 allows indefinite delay +#wal_receiver_create_temp_slot = off # create temp slot if primary_slot_name + # is not set +#wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables +#hot_standby_feedback = off # send info from standby to prevent + # query conflicts +#wal_receiver_timeout = 60s # time that receiver waits for + # communication from primary + # in milliseconds; 0 disables +#wal_retrieve_retry_interval = 5s # time to wait before retrying to + # retrieve WAL after a failed attempt +#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery +#sync_replication_slots = off # enables slot synchronization on the physical standby from the primary ++======= + #primary_conninfo = '' # connection string to sending server + #primary_slot_name = '' # replication slot on sending server + #hot_standby = on # "off" disallows queries during recovery + # (change requires restart) + #max_standby_archive_delay = 30s # max delay before canceling queries + # when reading WAL from archive; + # -1 allows indefinite delay + #max_standby_streaming_delay = 30s # max delay before canceling queries + # when reading streaming WAL; + # -1 allows indefinite delay + #wal_receiver_create_temp_slot = off # create temp slot if primary_slot_name + # is not set + #wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables + #cascade_replication_batch_size = 1 # maximum number of applied WAL records + # before cascade logical walsenders are notified on standby + # 1 disables records batching in cascade replication + #cascade_replication_batch_delay = 500ms # maximum time before cascade walsenders + # are notified about applied records if batching is enabled + # (i.e. if cascade_replication_batch_size is greater than 1) + # 0 disables timed notifications during batching + #hot_standby_feedback = off # send info from standby to prevent + # query conflicts + #wal_receiver_timeout = 60s # time that receiver waits for + # communication from primary + # in milliseconds; 0 disables + #wal_retrieve_retry_interval = 5s # time to wait before retrying to + # retrieve WAL after a failed attempt + #recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery + #sync_replication_slots = off # enables slot synchronization on the physical standby from the primary ++>>>>>>> theirs # - Subscribers -