diff options
Diffstat (limited to 'src/backend/storage/ipc')
| -rw-r--r-- | src/backend/storage/ipc/procarray.c | 20 | ||||
| -rw-r--r-- | src/backend/storage/ipc/standby.c | 11 |
2 files changed, 15 insertions, 16 deletions
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 36c58704126..976f7856fbf 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -1109,11 +1109,11 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) running->oldestRunningXid)) { standbyState = STANDBY_SNAPSHOT_READY; - elog(trace_recovery(DEBUG1), + elog(DEBUG1, "recovery snapshots are now enabled"); } else - elog(trace_recovery(DEBUG1), + elog(DEBUG1, "recovery snapshot waiting for non-overflowed snapshot or " "until oldest active xid on standby is at least %u (now %u)", standbySnapshotPendingXmin, @@ -1208,7 +1208,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) KnownAssignedXidsAdd(xids[i], xids[i], true); } - KnownAssignedXidsDisplay(trace_recovery(DEBUG3)); + KnownAssignedXidsDisplay(DEBUG3); } pfree(xids); @@ -1280,11 +1280,11 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running) Assert(FullTransactionIdIsValid(TransamVariables->nextXid)); - KnownAssignedXidsDisplay(trace_recovery(DEBUG3)); + KnownAssignedXidsDisplay(DEBUG3); if (standbyState == STANDBY_SNAPSHOT_READY) - elog(trace_recovery(DEBUG1), "recovery snapshots are now enabled"); + elog(DEBUG1, "recovery snapshots are now enabled"); else - elog(trace_recovery(DEBUG1), + elog(DEBUG1, "recovery snapshot waiting for non-overflowed snapshot or " "until oldest active xid on standby is at least %u (now %u)", standbySnapshotPendingXmin, @@ -4339,7 +4339,7 @@ RecordKnownAssignedTransactionIds(TransactionId xid) Assert(TransactionIdIsValid(xid)); Assert(TransactionIdIsValid(latestObservedXid)); - elog(trace_recovery(DEBUG4), "record known xact %u latestObservedXid %u", + elog(DEBUG4, "record known xact %u latestObservedXid %u", xid, latestObservedXid); /* @@ -4897,7 +4897,7 @@ KnownAssignedXidsRemove(TransactionId xid) { Assert(TransactionIdIsValid(xid)); - elog(trace_recovery(DEBUG4), "remove KnownAssignedXid %u", xid); + elog(DEBUG4, "remove KnownAssignedXid %u", xid); /* * Note: we cannot consider it an error to remove an XID that's not @@ -4951,13 +4951,13 @@ KnownAssignedXidsRemovePreceding(TransactionId removeXid) if (!TransactionIdIsValid(removeXid)) { - elog(trace_recovery(DEBUG4), "removing all KnownAssignedXids"); + elog(DEBUG4, "removing all KnownAssignedXids"); pArray->numKnownAssignedXids = 0; pArray->headKnownAssignedXids = pArray->tailKnownAssignedXids = 0; return; } - elog(trace_recovery(DEBUG4), "prune KnownAssignedXids to %u", removeXid); + elog(DEBUG4, "prune KnownAssignedXids to %u", removeXid); /* * Mark entries invalid starting at the tail. Since array is sorted, we diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index cc22d2e87cc..cea47bf6e57 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -997,8 +997,7 @@ StandbyAcquireAccessExclusiveLock(TransactionId xid, Oid dbOid, Oid relOid) TransactionIdDidAbort(xid)) return; - elog(trace_recovery(DEBUG4), - "adding recovery lock: db %u rel %u", dbOid, relOid); + elog(DEBUG4, "adding recovery lock: db %u rel %u", dbOid, relOid); /* dbOid is InvalidOid when we are locking a shared relation. */ Assert(OidIsValid(relOid)); @@ -1042,7 +1041,7 @@ StandbyReleaseXidEntryLocks(RecoveryLockXidEntry *xidentry) { LOCKTAG locktag; - elog(trace_recovery(DEBUG4), + elog(DEBUG4, "releasing recovery lock: xid %u db %u rel %u", entry->key.xid, entry->key.dbOid, entry->key.relOid); /* Release the lock ... */ @@ -1109,7 +1108,7 @@ StandbyReleaseAllLocks(void) HASH_SEQ_STATUS status; RecoveryLockXidEntry *entry; - elog(trace_recovery(DEBUG2), "release all standby locks"); + elog(DEBUG2, "release all standby locks"); hash_seq_init(&status, RecoveryLockXidHash); while ((entry = hash_seq_search(&status))) @@ -1369,7 +1368,7 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts) recptr = XLogInsert(RM_STANDBY_ID, XLOG_RUNNING_XACTS); if (CurrRunningXacts->subxid_overflow) - elog(trace_recovery(DEBUG2), + elog(DEBUG2, "snapshot of %d running transactions overflowed (lsn %X/%X oldest xid %u latest complete %u next xid %u)", CurrRunningXacts->xcnt, LSN_FORMAT_ARGS(recptr), @@ -1377,7 +1376,7 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts) CurrRunningXacts->latestCompletedXid, CurrRunningXacts->nextXid); else - elog(trace_recovery(DEBUG2), + elog(DEBUG2, "snapshot of %d+%d running transaction ids (lsn %X/%X oldest xid %u latest complete %u next xid %u)", CurrRunningXacts->xcnt, CurrRunningXacts->subxcnt, LSN_FORMAT_ARGS(recptr), |