diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/access/transam/timeline.c | 2 | ||||
-rw-r--r-- | src/backend/access/transam/transam.c | 2 | ||||
-rw-r--r-- | src/backend/access/transam/xlog.c | 31 | ||||
-rw-r--r-- | src/backend/access/transam/xlogfuncs.c | 2 | ||||
-rw-r--r-- | src/backend/access/transam/xlogutils.c | 2 | ||||
-rw-r--r-- | src/backend/postmaster/checkpointer.c | 5 | ||||
-rw-r--r-- | src/backend/postmaster/pgarch.c | 5 | ||||
-rw-r--r-- | src/backend/postmaster/postmaster.c | 2 |
8 files changed, 24 insertions, 27 deletions
diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c index a11f0f85264..b442e7aa88f 100644 --- a/src/backend/access/transam/timeline.c +++ b/src/backend/access/transam/timeline.c @@ -151,7 +151,7 @@ readTimeLineHistory(TimeLineID targetTLI) if (nfields != 3) ereport(FATAL, (errmsg("syntax error in history file: %s", fline), - errhint("Expected a transaction log switchpoint location."))); + errhint("Expected a write-ahead log switchpoint location."))); if (result && tli <= lasttli) ereport(FATAL, diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c index 562b53be9aa..968b2323647 100644 --- a/src/backend/access/transam/transam.c +++ b/src/backend/access/transam/transam.c @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * * transam.c - * postgres transaction log interface routines + * postgres transaction (commit) log interface routines * * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 5d6f8b75b8c..bc5fb4bb83d 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -1,7 +1,7 @@ /*------------------------------------------------------------------------- * * xlog.c - * PostgreSQL transaction log manager + * PostgreSQL write-ahead log manager * * * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group @@ -3532,7 +3532,7 @@ XLogFileOpen(XLogSegNo segno) if (fd < 0) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not open transaction log file \"%s\": %m", path))); + errmsg("could not open write-ahead log file \"%s\": %m", path))); return fd; } @@ -3838,7 +3838,7 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr) if (xldir == NULL) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not open transaction log directory \"%s\": %m", + errmsg("could not open write-ahead log directory \"%s\": %m", XLOGDIR))); /* @@ -3913,7 +3913,7 @@ RemoveNonParentXlogFiles(XLogRecPtr switchpoint, TimeLineID newTLI) if (xldir == NULL) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not open transaction log directory \"%s\": %m", + errmsg("could not open write-ahead log directory \"%s\": %m", XLOGDIR))); /* @@ -3994,7 +3994,7 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr) true, recycleSegNo, true)) { ereport(DEBUG2, - (errmsg("recycled transaction log file \"%s\"", + (errmsg("recycled write-ahead log file \"%s\"", segname))); CheckpointStats.ckpt_segs_recycled++; /* Needn't recheck that slot on future iterations */ @@ -4006,7 +4006,7 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr) int rc; ereport(DEBUG2, - (errmsg("removing transaction log file \"%s\"", + (errmsg("removing write-ahead log file \"%s\"", segname))); #ifdef WIN32 @@ -4026,7 +4026,7 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr) { ereport(LOG, (errcode_for_file_access(), - errmsg("could not rename old transaction log file \"%s\": %m", + errmsg("could not rename old write-ahead log file \"%s\": %m", path))); return; } @@ -4108,7 +4108,7 @@ CleanupBackupHistory(void) if (xldir == NULL) ereport(ERROR, (errcode_for_file_access(), - errmsg("could not open transaction log directory \"%s\": %m", + errmsg("could not open write-ahead log directory \"%s\": %m", XLOGDIR))); while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL) @@ -4117,9 +4117,8 @@ CleanupBackupHistory(void) { if (XLogArchiveCheckDone(xlde->d_name)) { - ereport(DEBUG2, - (errmsg("removing transaction log backup history file \"%s\"", - xlde->d_name))); + elog(DEBUG2, "removing WAL backup history file \"%s\"", + xlde->d_name); snprintf(path, sizeof(path), XLOGDIR "/%s", xlde->d_name); unlink(path); XLogArchiveCleanup(xlde->d_name); @@ -5074,7 +5073,7 @@ BootStrapXLOG(void) errno = ENOSPC; ereport(PANIC, (errcode_for_file_access(), - errmsg("could not write bootstrap transaction log file: %m"))); + errmsg("could not write bootstrap write-ahead log file: %m"))); } pgstat_report_wait_end(); @@ -5082,13 +5081,13 @@ BootStrapXLOG(void) if (pg_fsync(openLogFile) != 0) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not fsync bootstrap transaction log file: %m"))); + errmsg("could not fsync bootstrap write-ahead log file: %m"))); pgstat_report_wait_end(); if (close(openLogFile)) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not close bootstrap transaction log file: %m"))); + errmsg("could not close bootstrap write-ahead log file: %m"))); openLogFile = -1; @@ -8432,7 +8431,7 @@ LogCheckpointEnd(bool restartpoint) average_usecs = average_sync_time - (uint64) average_secs *1000000; elog(LOG, "%s complete: wrote %d buffers (%.1f%%); " - "%d transaction log file(s) added, %d removed, %d recycled; " + "%d WAL file(s) added, %d removed, %d recycled; " "write=%ld.%03d s, sync=%ld.%03d s, total=%ld.%03d s; " "sync files=%d, longest=%ld.%03d s, average=%ld.%03d s; " "distance=%d kB, estimate=%d kB", @@ -8842,7 +8841,7 @@ CreateCheckPoint(int flags) */ if (shutdown && checkPoint.redo != ProcLastRecPtr) ereport(PANIC, - (errmsg("concurrent transaction log activity while database system is shutting down"))); + (errmsg("concurrent write-ahead log activity while database system is shutting down"))); /* * Remember the prior checkpoint's redo pointer, used later to determine diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c index aa47b0dcffc..8568c8abd64 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -2,7 +2,7 @@ * * xlogfuncs.c * - * PostgreSQL transaction log manager user interface functions + * PostgreSQL write-ahead log manager user interface functions * * This file contains WAL control and information functions. * diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index fb7f2e79746..d7f2e55b090 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -2,7 +2,7 @@ * * xlogutils.c * - * PostgreSQL transaction log manager utility routines + * PostgreSQL write-ahead log manager utility routines * * This file contains support routines that are used by XLOG replay functions. * None of this code is used during normal system operation. diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c index d12db0d5a7b..a8dc355eada 100644 --- a/src/backend/postmaster/checkpointer.c +++ b/src/backend/postmaster/checkpointer.c @@ -626,9 +626,8 @@ CheckArchiveTimeout(void) * assume nothing happened. */ if ((switchpoint % XLogSegSize) != 0) - ereport(DEBUG1, - (errmsg("transaction log switch forced (archive_timeout=%d)", - XLogArchiveTimeout))); + elog(DEBUG1, "write-ahead log switch forced (archive_timeout=%d)", + XLogArchiveTimeout); } /* diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index f3f58bd3908..2dce39fdefd 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -482,7 +482,7 @@ pgarch_ArchiverCopyLoop(void) if (++failures >= NUM_ARCHIVE_RETRIES) { ereport(WARNING, - (errmsg("archiving transaction log file \"%s\" failed too many times, will try again later", + (errmsg("archiving write-ahead log file \"%s\" failed too many times, will try again later", xlog))); return; /* give up archiving for now */ } @@ -628,8 +628,7 @@ pgarch_archiveXlog(char *xlog) return false; } - ereport(DEBUG1, - (errmsg("archived transaction log file \"%s\"", xlog))); + elog(DEBUG1, "archived write-ahead log file \"%s\"", xlog); snprintf(activitymsg, sizeof(activitymsg), "last was %s", xlog); set_ps_display(activitymsg, false); diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 01f1c2805f0..fdce5524f4c 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -5036,7 +5036,7 @@ sigusr1_handler(SIGNAL_ARGS) { /* * Send SIGUSR1 to archiver process, to wake it up and begin archiving - * next transaction log file. + * next WAL file. */ signal_child(PgArchPID, SIGUSR1); } |