Commit cac0e366 authored by Simon Riggs's avatar Simon Riggs

Revert bf08f229

Remove recent changes to logging XLOG_RUNNING_XACTS by request.
parent 3fe3511d
......@@ -330,11 +330,8 @@ BackgroundWriterMain(void)
if (now >= timeout &&
last_snapshot_lsn != GetXLogInsertRecPtr())
{
XLogRecPtr log_standby_lsn = LogStandbySnapshot();
last_snapshot_lsn = LogStandbySnapshot();
last_snapshot_ts = now;
if (!XLogRecPtrIsInvalid(log_standby_lsn))
last_snapshot_lsn = log_standby_lsn;
}
}
......
......@@ -902,7 +902,6 @@ LogStandbySnapshot(void)
RunningTransactions running;
xl_standby_lock *locks;
int nlocks;
static bool last_snapshot_overflowed = false;
Assert(XLogStandbyInfoActive());
......@@ -933,28 +932,8 @@ LogStandbySnapshot(void)
* only a shared lock.
*/
if (wal_level < WAL_LEVEL_LOGICAL)
{
LWLockRelease(ProcArrayLock);
/*
* Don't bother to log anything if nothing is happening, if we are
* using archive_timeout > 0 and we didn't overflow snapshot last time.
*
* This ensures that we don't issue an empty WAL record, which can
* be annoying when used in conjunction with archive timeout.
*/
if (running->xcnt == 0 &&
nlocks == 0 &&
XLogArchiveTimeout > 0 &&
!last_snapshot_overflowed)
{
LWLockRelease(XidGenLock);
return InvalidXLogRecPtr;
}
last_snapshot_overflowed = running->subxid_overflow;
}
recptr = LogCurrentRunningXacts(running);
/* Release lock if we kept it longer ... */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment