]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Fix publisher shutdown hang caused by logical walsender busy loop.
authorFujii Masao <fujii@postgresql.org>
Fri, 6 Mar 2026 07:43:40 +0000 (16:43 +0900)
committerFujii Masao <fujii@postgresql.org>
Fri, 6 Mar 2026 07:45:05 +0000 (16:45 +0900)
Previously, when logical replication was running, shutting down
the publisher could cause the logical walsender to enter a busy loop
and prevent the publisher from completing shutdown.

During shutdown, the logical walsender waits for all pending WAL
to be written out. However, some WAL records could remain unflushed,
causing the walsender to wait indefinitely.

The issue occurred because the walsender used XLogBackgroundFlush() to
flush pending WAL. This function does not guarantee that all WAL is written.
For example, WAL generated by a transaction without an assigned
transaction ID that aborts might not be flushed.

This commit fixes the bug by making the logical walsender call XLogFlush()
instead, ensuring that all pending WAL is written and preventing
the busy loop during shutdown.

Backpatch to all supported versions.

Author: Anthonin Bonnefoy <anthonin.bonnefoy@datadoghq.com>
Reviewed-by: Alexander Lakhin <exclusion@gmail.com>
Reviewed-by: Fujii Masao <masao.fujii@gmail.com>
Discussion: https://postgr.es/m/CAO6_Xqo3co3BuUVEVzkaBVw9LidBgeeQ_2hfxeLMQcXwovB3GQ@mail.gmail.com
Backpatch-through: 14

src/backend/replication/walsender.c

index 3fe24bb44ab9b92d9ba6120e27a4b9bd5da1cf7e..3fd9db5dcca1240fc57ba6b7fbff5ca19c132837 100644 (file)
@@ -1451,8 +1451,8 @@ WalSndWaitForWal(XLogRecPtr loc)
                 * otherwise we'd possibly end up waiting for WAL that never gets
                 * written, because walwriter has shut down already.
                 */
-               if (got_STOPPING)
-                       XLogBackgroundFlush();
+               if (got_STOPPING && !RecoveryInProgress())
+                       XLogFlush(GetXLogInsertRecPtr());
 
                /* Update our idea of the currently flushed position. */
                if (!RecoveryInProgress())