diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 11 | ||||
| -rw-r--r-- | src/backend/storage/ipc/standby.c | 4 | ||||
| -rw-r--r-- | src/include/storage/standby.h | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5a06ae2a4a3..50e2b22dd70 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -8019,18 +8019,9 @@ CreateCheckPoint(int flags) * * If we are shutting down, or Startup process is completing crash * recovery we don't need to write running xact data. - * - * Update checkPoint.nextXid since we may have a later value. If we - * do update the value, and we have wrapped, increment epoch also. */ if (!shutdown && XLogStandbyInfoActive()) - { - TransactionId prevXid = checkPoint.nextXid; - - LogStandbySnapshot(&checkPoint.nextXid); - if (checkPoint.nextXid < prevXid) - checkPoint.nextXidEpoch++; - } + LogStandbySnapshot(); START_CRIT_SECTION(); diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 0658feb076c..8b3b8331aa9 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -865,7 +865,7 @@ standby_desc(StringInfo buf, uint8 xl_info, char *rec) * from a time when they were possible. */ void -LogStandbySnapshot(TransactionId *nextXid) +LogStandbySnapshot(void) { RunningTransactions running; xl_standby_lock *locks; @@ -894,8 +894,6 @@ LogStandbySnapshot(TransactionId *nextXid) LogCurrentRunningXacts(running); /* GetRunningTransactionData() acquired XidGenLock, we must release it */ LWLockRelease(XidGenLock); - - *nextXid = running->nextXid; } /* diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index ed3b66b35df..4b69be077b1 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -110,6 +110,6 @@ typedef RunningTransactionsData *RunningTransactions; extern void LogAccessExclusiveLock(Oid dbOid, Oid relOid); extern void LogAccessExclusiveLockPrepare(void); -extern void LogStandbySnapshot(TransactionId *nextXid); +extern void LogStandbySnapshot(void); #endif /* STANDBY_H */ |