=== Applying patches on top of PostgreSQL commit ID 25303961d09c7e2354a48cbce511a06cce691907 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Dec 6 18:57:23 UTC 2025 On branch cf/5806 nothing to commit, working tree clean === using 'git am' to apply patch ./v11-0001-Optimize-transaction-waiting-during-logical-deco.patch === Applying: Optimize transaction waiting during logical decoding on hot standby servers. On hot standby servers, XactLockTableWait falls back to polling TransactionIdIsInProgress() with fixed 1ms sleeps when transactions from the primary have no local lock table entries, causing excessive CPU usage. Using index info to reconstruct a base tree... M src/backend/replication/logical/snapbuild.c M src/backend/utils/activity/wait_event_names.txt M src/include/storage/lwlocklist.h Falling back to patching base and 3-way merge... Auto-merging src/include/storage/lwlocklist.h CONFLICT (content): Merge conflict in src/include/storage/lwlocklist.h Auto-merging src/backend/utils/activity/wait_event_names.txt CONFLICT (content): Merge conflict in src/backend/utils/activity/wait_event_names.txt Auto-merging src/backend/replication/logical/snapbuild.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Optimize transaction waiting during logical decoding on hot standby servers. On hot standby servers, XactLockTableWait falls back to polling TransactionIdIsInProgress() with fixed 1ms sleeps when transactions from the primary have no local lock table entries, causing excessive CPU usage. 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 src/backend/replication/logical/snapbuild.c M src/backend/storage/ipc/procarray.c M src/backend/storage/lmgr/lmgr.c M src/backend/utils/activity/wait_event_names.txt M src/include/storage/lwlocklist.h M src/include/storage/procarray.h === using patch(1) to apply patch ./v11-0001-Optimize-transaction-waiting-during-logical-deco.patch === patching file src/backend/replication/logical/snapbuild.c patching file src/backend/storage/ipc/procarray.c patching file src/backend/storage/lmgr/lmgr.c patching file src/backend/utils/activity/wait_event_names.txt Hunk #1 succeeded at 161 (offset 2 lines). Hunk #2 FAILED at 353. 1 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/activity/wait_event_names.txt.rej patching file src/include/storage/lwlocklist.h Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file src/include/storage/lwlocklist.h.rej patching file src/include/storage/procarray.h Unstaged changes after reset: M src/backend/replication/logical/snapbuild.c M src/backend/storage/ipc/procarray.c M src/backend/storage/lmgr/lmgr.c M src/backend/utils/activity/wait_event_names.txt M src/include/storage/procarray.h Removing src/backend/utils/activity/wait_event_names.txt.rej Removing src/include/storage/lwlocklist.h.rej === using 'git apply' to apply patch ./v11-0001-Optimize-transaction-waiting-during-logical-deco.patch === Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly. Applied patch to 'src/backend/storage/ipc/procarray.c' cleanly. Applied patch to 'src/backend/storage/lmgr/lmgr.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' with conflicts. Applied patch to 'src/include/storage/lwlocklist.h' with conflicts. Applied patch to 'src/include/storage/procarray.h' cleanly. U src/backend/utils/activity/wait_event_names.txt U src/include/storage/lwlocklist.h diff --cc src/backend/utils/activity/wait_event_names.txt index 1e5e368a5dc,c3bc115da30..00000000000 --- a/src/backend/utils/activity/wait_event_names.txt +++ b/src/backend/utils/activity/wait_event_names.txt @@@ -357,7 -353,7 +358,11 @@@ DSMRegistry "Waiting to read or update InjectionPoint "Waiting to read or update information related to injection points." SerialControl "Waiting to read or update shared pg_serial state." AioWorkerSubmissionQueue "Waiting to access AIO worker submission queue." ++<<<<<<< ours +WaitLSN "Waiting to read or update shared Wait-for-LSN state." ++======= + XidWaitHash "Waiting to access XID wait hash table." ++>>>>>>> theirs # # END OF PREDEFINED LWLOCKS (DO NOT CHANGE THIS LINE) diff --cc src/include/storage/lwlocklist.h index 5b0ce383408,0a21ceaf04e..00000000000 --- a/src/include/storage/lwlocklist.h +++ b/src/include/storage/lwlocklist.h @@@ -85,7 -85,7 +85,11 @@@ PG_LWLOCK(50, DSMRegistry PG_LWLOCK(51, InjectionPoint) PG_LWLOCK(52, SerialControl) PG_LWLOCK(53, AioWorkerSubmissionQueue) ++<<<<<<< ours +PG_LWLOCK(54, WaitLSN) ++======= + PG_LWLOCK(54, XidWaitHash) ++>>>>>>> theirs /* * There also exist several built-in LWLock tranches. As with the predefined