=== Applying patches on top of PostgreSQL commit ID 9ea3b6f751abd7701f3f32d9df26d66410754c94 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 6 22:37:20 UTC 2025 === expanding ./logs.zip Archive: ./logs.zip extracting: 049_physical_replication_restart_lsn_backward_standby1.log extracting: 049_physical_replication_restart_lsn_backward_primary.log === expanding ./test_restart_lsn_backward.zip Archive: ./test_restart_lsn_backward.zip extracting: 049_physical_replication_restart_lsn_backward.pl On branch cf/5770 nothing to commit, working tree clean === using 'git am' to apply patch ./physical_replication_restart_lsn_backward.patch === Patch format detection failed. === using patch(1) to apply patch ./physical_replication_restart_lsn_backward.patch === patching file src/backend/access/transam/xlog.c Hunk #2 FAILED at 6861. 1 out of 6 hunks FAILED -- saving rejects to file src/backend/access/transam/xlog.c.rej patching file src/backend/access/transam/xlogrecovery.c Hunk #1 succeeded at 1919 (offset 1 line). Hunk #2 succeeded at 2012 (offset 1 line). Hunk #3 succeeded at 3649 (offset 1 line). Hunk #4 succeeded at 3658 (offset 1 line). Hunk #5 succeeded at 3883 (offset 1 line). patching file src/backend/postmaster/checkpointer.c Hunk #1 succeeded at 361 (offset 16 lines). Hunk #2 succeeded at 589 (offset 16 lines). patching file src/backend/replication/walreceiver.c Hunk #2 succeeded at 851 with fuzz 1. Hunk #5 FAILED at 1148. 1 out of 5 hunks FAILED -- saving rejects to file src/backend/replication/walreceiver.c.rej patching file src/backend/replication/walsender.c Hunk #1 succeeded at 2387 (offset 10 lines). Unstaged changes after reset: M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogrecovery.c M src/backend/postmaster/checkpointer.c M src/backend/replication/walreceiver.c M src/backend/replication/walsender.c Removing src/backend/access/transam/xlog.c.rej Removing src/backend/replication/walreceiver.c.rej === using 'git apply' to apply patch ./physical_replication_restart_lsn_backward.patch === /work/patches/./physical_replication_restart_lsn_backward.patch:74: trailing whitespace. Applied patch to 'src/backend/access/transam/xlog.c' with conflicts. Applied patch to 'src/backend/access/transam/xlogrecovery.c' cleanly. Applied patch to 'src/backend/postmaster/checkpointer.c' cleanly. Applied patch to 'src/backend/replication/walreceiver.c' with conflicts. Applied patch to 'src/backend/replication/walsender.c' cleanly. U src/backend/access/transam/xlog.c U src/backend/replication/walreceiver.c warning: 1 line adds whitespace errors. diff --cc src/backend/access/transam/xlog.c index 9a4de1616bc,6e325db45d4..00000000000 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@@ -6859,7 -6860,8 +6860,12 @@@ LogCheckpointStart(int flags, bool rest (flags & CHECKPOINT_WAIT) ? " wait" : "", (flags & CHECKPOINT_CAUSE_XLOG) ? " wal" : "", (flags & CHECKPOINT_CAUSE_TIME) ? " time" : "", ++<<<<<<< ours + (flags & CHECKPOINT_FLUSH_UNLOGGED) ? " flush-unlogged" : ""))); ++======= + (flags & CHECKPOINT_FLUSH_ALL) ? " flush-all" : ""))); + #endif ++>>>>>>> theirs } /* diff --cc src/backend/replication/walreceiver.c index 7361ffc9dcf,ea9168071f0..00000000000 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@@ -848,9 -851,11 +851,11 @@@ XLogWalRcvProcessMsg(unsigned char type buf += hdrlen; len -= hdrlen; XLogWalRcvWrite(buf, len, dataStart, tli); + elog(LOG, "XLogWalRcvProcessMsg: wrote %zu bytes of WAL at %X/%X", + len, LSN_FORMAT_ARGS(dataStart)); break; } - case 'k': /* Keepalive */ + case PqReplMsg_Keepalive: { StringInfoData incoming_message; @@@ -1138,7 -1148,7 +1148,11 @@@ XLogWalRcvSendReply(bool force, bool re pq_sendbyte(&reply_message, requestReply ? 1 : 0); /* Send it */ ++<<<<<<< ours + elog(DEBUG2, "sending write %X/%08X flush %X/%08X apply %X/%08X%s", ++======= + elog(LOG, "sending write %X/%X flush %X/%X apply %X/%X%s", ++>>>>>>> theirs LSN_FORMAT_ARGS(writePtr), LSN_FORMAT_ARGS(flushPtr), LSN_FORMAT_ARGS(applyPtr),