database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Change some debug ereports to elogs, as requested by translation team.

Browse Source
This commit is contained in:
Simon Riggs 2010-04-06 10:50:57 +00:00
parent 08c1d4e560
commit 19c7a59b56
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/storage/ipc/procarray.c
View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.61 2010/03/11 09:26:59 heikki Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/procarray.c,v 1.62 2010/04/06 10:50:57 sriggs Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -2220,9 +2220,8 @@ RecordKnownAssignedTransactionIds(TransactionId xid)
if (TransactionIdPrecedes(xid, snapshotOldestActiveXid)) if (TransactionIdPrecedes(xid, snapshotOldestActiveXid))
return; return;
ereport(trace_recovery(DEBUG4), elog(trace_recovery(DEBUG4), "record known xact %u latestObservedXid %u",
(errmsg("record known xact %u latestObservedXid %u", xid, latestObservedXid);
xid, latestObservedXid)));
/* /*
* When a newly observed xid arrives, it is frequently the case that it is * When a newly observed xid arrives, it is frequently the case that it is
@ -2253,9 +2252,9 @@ RecordKnownAssignedTransactionIds(TransactionId xid)
while (TransactionIdPrecedesOrEquals(next_expected_xid, xid)) while (TransactionIdPrecedesOrEquals(next_expected_xid, xid))
{ {
if (TransactionIdPrecedes(next_expected_xid, xid)) if (TransactionIdPrecedes(next_expected_xid, xid))
ereport(trace_recovery(DEBUG4), elog(trace_recovery(DEBUG4),
(errmsg("recording unobserved xid %u (latestObservedXid %u)", "recording unobserved xid %u (latestObservedXid %u)",
next_expected_xid, latestObservedXid))); next_expected_xid, latestObservedXid);
KnownAssignedXidsAdd(&next_expected_xid, 1); KnownAssignedXidsAdd(&next_expected_xid, 1);
/* /*
@ -2374,9 +2373,7 @@ KnownAssignedXidsAdd(TransactionId *xids, int nxids)
{ {
KnownAssignedXidsDisplay(LOG); KnownAssignedXidsDisplay(LOG);
LWLockRelease(ProcArrayLock); LWLockRelease(ProcArrayLock);
ereport(ERROR, elog(ERROR, "too many KnownAssignedXids (%u)", procArray->maxKnownAssignedXids);
(errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("too many KnownAssignedXids")));
} }
result = (TransactionId *) hash_search(KnownAssignedXidsHash, &xids[i], HASH_ENTER, result = (TransactionId *) hash_search(KnownAssignedXidsHash, &xids[i], HASH_ENTER,

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

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.15 2010/03/11 09:10:25 heikki Exp $ * $PostgreSQL: pgsql/src/backend/storage/ipc/standby.c,v 1.16 2010/04/06 10:50:57 sriggs Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -857,19 +857,19 @@ LogCurrentRunningXacts(RunningTransactions CurrRunningXacts)
recptr = XLogInsert(RM_STANDBY_ID, XLOG_RUNNING_XACTS, rdata); recptr = XLogInsert(RM_STANDBY_ID, XLOG_RUNNING_XACTS, rdata);
if (CurrRunningXacts->subxid_overflow) if (CurrRunningXacts->subxid_overflow)
ereport(trace_recovery(DEBUG2), elog(trace_recovery(DEBUG2),
(errmsg("snapshot of %u running transactions overflowed (lsn %X/%X oldest xid %u next xid %u)", "snapshot of %u running transactions overflowed (lsn %X/%X oldest xid %u next xid %u)",
CurrRunningXacts->xcnt, CurrRunningXacts->xcnt,
recptr.xlogid, recptr.xrecoff, recptr.xlogid, recptr.xrecoff,
CurrRunningXacts->oldestRunningXid, CurrRunningXacts->oldestRunningXid,
CurrRunningXacts->nextXid))); CurrRunningXacts->nextXid);
else else
ereport(trace_recovery(DEBUG2), elog(trace_recovery(DEBUG2),
(errmsg("snapshot of %u running transaction ids (lsn %X/%X oldest xid %u next xid %u)", "snapshot of %u running transaction ids (lsn %X/%X oldest xid %u next xid %u)",
CurrRunningXacts->xcnt, CurrRunningXacts->xcnt,
recptr.xlogid, recptr.xrecoff, recptr.xlogid, recptr.xrecoff,
CurrRunningXacts->oldestRunningXid, CurrRunningXacts->oldestRunningXid,
CurrRunningXacts->nextXid))); CurrRunningXacts->nextXid);
} }