agora inbox for pgsql-committers@postgresql.org
help / color / mirror / Atom feedFrom: Alexander Korotkov <akorotkov@postgresql.org>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Explicitly forbid non-top-level WAIT FOR execution
Date: Mon, 13 Apr 2026 11:05:33 +0000
Message-ID: <E1wCF6i-000mOw-1a@gemulon.postgresql.org> (raw)
Explicitly forbid non-top-level WAIT FOR execution
Previously we were relying on a snapshot-based check to detect invalid
execution contexts. However, when WAIT FOR is wrapped into a stored
procedure or a DO block, it could pass this check, causing an error
elsewhere.
This commit implements an explicit isTopLevel check to reject WAIT FOR
when called from within a function, procedure, or DO block. The
isTopLevel check catches these cases early with a clear error message,
matching the pattern used by other utility commands like VACUUM and
REINDEX. The snapshot check is retained for the remaining case:
top-level execution within a transaction block using an isolation level
higher than READ COMMITTED.
Also adds tests for WAIT FOR LSN wrapped in a procedure and DO block,
complementing the existing test that uses a function wrapper. Relevant
documentation paragraph is also added.
Reported-by: Satyanarayana Narlapuram <satyanarlapuram@gmail.com>
Discussion: https://postgr.es/m/CAHg%2BQDcN-n3NUqgRtj%3DBQb9fFQmH8-DeEROCr%3DPDbw_BBRKOYA%40mail.gmail.com
Author: Satyanarayana Narlapuram <satyanarlapuram@gmail.com>
Reviewed-by: Alexander Korotkov <aekorotkov@gmail.com>
Reviewed-by: Xuneng Zhou <xunengzhou@gmail.com>
Branch
------
master
Details
-------
https://git.postgresql.org/pg/commitdiff/a8b61c23c5ff980312026a05cab5502aa31fd710
Modified Files
--------------
doc/src/sgml/ref/wait_for.sgml | 8 ++++++++
src/backend/commands/wait.c | 23 +++++++++++++++++------
src/backend/tcop/utility.c | 3 ++-
src/include/commands/wait.h | 3 ++-
src/test/recovery/t/049_wait_for_lsn.pl | 30 +++++++++++++++++++++++++++---
5 files changed, 56 insertions(+), 11 deletions(-)
Message-ID: <E1wCF6i-000mOw-1a@gemulon.postgresql.org>
Permalink: ../E1wCF6i-000mOw-1a@gemulon.postgresql.org/
Also on: postgresql.org/message-id/E1wCF6i-000mOw-1a@gemulon.postgresql.org
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: akorotkov@postgresql.org, pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Explicitly forbid non-top-level WAIT FOR execution
In-Reply-To: <E1wCF6i-000mOw-1a@gemulon.postgresql.org>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox