rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert bf08f2292f 

Remove recent changes to logging XLOG_RUNNING_XACTS by request.
This commit is contained in:
Simon Riggs 2016-04-06 14:03:46 +01:00
parent 3fe3511d05
commit cac0e36682
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/postmaster/bgwriter.c
View File

@ -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;
}
}

21
src/backend/storage/ipc/standby.c
View File

@ -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 ... */