Fix snapshot handling bug in recent BRIN fix

Commit a95e3d84c0e0 added ActiveSnapshot push+pop when processing
work-items (BRIN autosummarization), but forgot to handle the case of
a transaction failing during the run, which drops the snapshot untimely.
Fix by making the pop conditional on an element being actually there.

Author: Álvaro Herrera <[email protected]>
Backpatch-through: 13
Discussion: https://postgr.es/m/202511041648[email protected]

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 7ed831693415c1081f9a1a75fb87a173d7cffefa..246ac2bec88a4dffa1e0c376d98789cde706217d 100644 (file)
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -2682,7 +2682,8 @@ deleted:
 
        PushActiveSnapshot(GetTransactionSnapshot());
        perform_work_item(workitem);
-       PopActiveSnapshot();
+       if (ActiveSnapshotSet())    /* transaction could have aborted */
+           PopActiveSnapshot();
 
        /*
         * Check for config changes before acquiring lock for further jobs.