From: Tom Lane <tgl@sss.pgh.pa.us>
To: pgsql-committers@lists.postgresql.org
Subject: pgsql: Fix Portal snapshot tracking to handle subtransactions properly.
Date: Fri, 01 Oct 2021 15:10:38 +0000
Message-ID: <E1mWKBK-0006c1-9Q@gemulon.postgresql.org> (raw)
Fix Portal snapshot tracking to handle subtransactions properly.
Commit 84f5c2908 forgot to consider the possibility that
EnsurePortalSnapshotExists could run inside a subtransaction with
lifespan shorter than the Portal's. In that case, the new active
snapshot would be popped at the end of the subtransaction, leaving
a dangling pointer in the Portal, with mayhem ensuing.
To fix, make sure the ActiveSnapshot stack entry is marked with
the same subtransaction nesting level as the associated Portal.
It's certainly safe to do so since we won't be here at all unless
the stack is empty; hence we can't create an out-of-order stack.
Let's also apply this logic in the case where PortalRunUtility
sets portalSnapshot, just to be sure that path can't cause similar
problems. It's slightly less clear that that path can't create
an out-of-order stack, so add an assertion guarding it.
Report and patch by Bertrand Drouvot (with kibitzing by me).
Back-patch to v11, like the previous commit.
Discussion: https://postgr.es/m/ff82b8c5-77f4-3fe7-6028-fcf3303e82dd@amazon.com
Branch
------
REL_13_STABLE
Details
-------
https://git.postgresql.org/pg/commitdiff/04ef2021e3ca7207b87ffce437b0b4db73a7f6b2
Modified Files
--------------
src/backend/access/transam/xact.c | 1 +
src/backend/tcop/pquery.c | 27 +++++++++++++++------
src/backend/utils/mmgr/portalmem.c | 4 ++++
src/backend/utils/time/snapmgr.c | 17 ++++++++++++-
src/include/utils/portal.h | 4 ++++
src/include/utils/snapmgr.h | 1 +
.../plpgsql/src/expected/plpgsql_transaction.out | 28 ++++++++++++++++++++++
src/pl/plpgsql/src/sql/plpgsql_transaction.sql | 21 ++++++++++++++++
8 files changed, 95 insertions(+), 8 deletions(-)
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 from your mail client; the link fills in
the headers below: reply via email
Some clients, webmail especially, drop In-Reply-To and References from
a link, and the reply then starts a new thread: use the mbox below.
To: pgsql-committers@postgresql.org
Cc: tgl@sss.pgh.pa.us
Subject: Re: pgsql: Fix Portal snapshot tracking to handle subtransactions properly.
In-Reply-To: <E1mWKBK-0006c1-9Q@gemulon.postgresql.org>
References: <E1mWKBK-0006c1-9Q@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 DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox