mirror of
https://github.com/postgres/postgres.git
synced 2025-04-27 22:56:53 +03:00
Revert bf08f2292ffca14fd133aa0901d1563b6ecd6894
Remove recent changes to logging XLOG_RUNNING_XACTS by request.
This commit is contained in:
parent
3fe3511d05
commit
cac0e36682
@ -330,11 +330,8 @@ BackgroundWriterMain(void)
|
|||||||
if (now >= timeout &&
|
if (now >= timeout &&
|
||||||
last_snapshot_lsn != GetXLogInsertRecPtr())
|
last_snapshot_lsn != GetXLogInsertRecPtr())
|
||||||
{
|
{
|
||||||
XLogRecPtr log_standby_lsn = LogStandbySnapshot();
|
last_snapshot_lsn = LogStandbySnapshot();
|
||||||
|
|
||||||
last_snapshot_ts = now;
|
last_snapshot_ts = now;
|
||||||
if (!XLogRecPtrIsInvalid(log_standby_lsn))
|
|
||||||
last_snapshot_lsn = log_standby_lsn;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -902,7 +902,6 @@ LogStandbySnapshot(void)
|
|||||||
RunningTransactions running;
|
RunningTransactions running;
|
||||||
xl_standby_lock *locks;
|
xl_standby_lock *locks;
|
||||||
int nlocks;
|
int nlocks;
|
||||||
static bool last_snapshot_overflowed = false;
|
|
||||||
|
|
||||||
Assert(XLogStandbyInfoActive());
|
Assert(XLogStandbyInfoActive());
|
||||||
|
|
||||||
@ -933,28 +932,8 @@ LogStandbySnapshot(void)
|
|||||||
* only a shared lock.
|
* only a shared lock.
|
||||||
*/
|
*/
|
||||||
if (wal_level < WAL_LEVEL_LOGICAL)
|
if (wal_level < WAL_LEVEL_LOGICAL)
|
||||||
{
|
|
||||||
LWLockRelease(ProcArrayLock);
|
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);
|
recptr = LogCurrentRunningXacts(running);
|
||||||
|
|
||||||
/* Release lock if we kept it longer ... */
|
/* Release lock if we kept it longer ... */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user