mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always SnapshotResetXmin() during ClearTransaction()

Browse Source 
Avoid corner cases during 2PC with 6bad580d9e678a0b604883e14d8401d469b06566
This commit is contained in:
Simon Riggs 2017-04-06 10:30:22 -04:00
parent 3217327053
commit cd0cebaf7d
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/access/transam/xact.c
View File

@ -2640,7 +2640,7 @@ CleanupTransaction(void)
* do abort cleanup processing * do abort cleanup processing
*/ */
AtCleanup_Portals(); /* now safe to release portal memory */ AtCleanup_Portals(); /* now safe to release portal memory */
AtEOXact_Snapshot(false, false); /* and release the transaction's snapshots */ AtEOXact_Snapshot(false, true); /* and release the transaction's snapshots */
CurrentResourceOwner = NULL; /* and resource owner */ CurrentResourceOwner = NULL; /* and resource owner */
if (TopTransactionResourceOwner) if (TopTransactionResourceOwner)

15
src/backend/utils/time/snapmgr.c
View File

@ -1051,7 +1051,7 @@ AtSubAbort_Snapshot(int level)
* Snapshot manager's cleanup function for end of transaction * Snapshot manager's cleanup function for end of transaction
*/ */
void void
AtEOXact_Snapshot(bool isCommit, bool isPrepare) AtEOXact_Snapshot(bool isCommit, bool resetXmin)
{ {
/* /*
* In transaction-snapshot mode we must release our privately-managed * In transaction-snapshot mode we must release our privately-managed
@ -1137,16 +1137,15 @@ AtEOXact_Snapshot(bool isCommit, bool isPrepare)
FirstSnapshotSet = false; FirstSnapshotSet = false;
/* /*
* During normal commit and abort processing, we call * During normal commit processing, we call
* ProcArrayEndTransaction() or ProcArrayClearTransaction() to * ProcArrayEndTransaction() to reset the PgXact->xmin. That call
* reset the PgXact->xmin. That call happens prior to the call to * happens prior to the call to AtEOXact_Snapshot(), so we need
* AtEOXact_Snapshot(), so we need not touch xmin here at all, * not touch xmin here at all.
* accept when we are preparing a transaction.
*/ */
if (isPrepare) if (resetXmin)
SnapshotResetXmin(); SnapshotResetXmin();
Assert(isPrepare || MyPgXact->xmin == 0); Assert(resetXmin || MyPgXact->xmin == 0);
} }

2
src/include/utils/snapmgr.h
View File

@ -85,7 +85,7 @@ extern void UnregisterSnapshotFromOwner(Snapshot snapshot, ResourceOwner owner);
extern void AtSubCommit_Snapshot(int level); extern void AtSubCommit_Snapshot(int level);
extern void AtSubAbort_Snapshot(int level); extern void AtSubAbort_Snapshot(int level);
extern void AtEOXact_Snapshot(bool isCommit, bool isPrepare); extern void AtEOXact_Snapshot(bool isCommit, bool resetXmin);
extern void ImportSnapshot(const char *idstr); extern void ImportSnapshot(const char *idstr);
extern bool XactHasExportedSnapshots(void); extern bool XactHasExportedSnapshots(void);