diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2016-04-06 14:03:46 +0100 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2016-04-06 14:03:46 +0100 |
| commit | cac0e36682970ec1276d3da3d3ee37325544a2bb (patch) | |
| tree | 5ace363358c9eda3bb06e00a41ff346610149357 /src | |
| parent | 3fe3511d05127cc024b221040db2eeb352e7d716 (diff) | |
| download | postgresql-cac0e36682970ec1276d3da3d3ee37325544a2bb.tar.gz postgresql-cac0e36682970ec1276d3da3d3ee37325544a2bb.zip | |
Revert bf08f2292ffca14fd133aa0901d1563b6ecd6894
Remove recent changes to logging XLOG_RUNNING_XACTS by request.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/bgwriter.c | 5 | ||||
| -rw-r--r-- | src/backend/storage/ipc/standby.c | 21 |
2 files changed, 1 insertions, 25 deletions
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c index 654e4f8bd57..00f03d8acbe 100644 --- a/src/backend/postmaster/bgwriter.c +++ b/src/backend/postmaster/bgwriter.c @@ -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; } } diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 8b9b438ca92..6a9bf842d39 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -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 ... */ |