From 54b1370b2092fb12e6ea4832387f4703ad1915b6 Mon Sep 17 00:00:00 2001 From: Bharath Rupireddy Date: Sat, 26 Mar 2022 05:52:18 +0000 Subject: [PATCH v3] Use "WAL segment" instead of "log segment" It looks like we use "log segment" in various user-facing messages. The term "log" can mean server logs as well. The "WAL segment" suits well here and it is consistently used across the other user-facing messages. --- src/backend/access/transam/xlogreader.c | 10 +++++----- src/backend/access/transam/xlogrecovery.c | 6 +++--- src/backend/access/transam/xlogutils.c | 4 ++-- src/backend/replication/walreceiver.c | 6 +++--- src/bin/pg_resetwal/pg_resetwal.c | 2 +- src/bin/pg_upgrade/controldata.c | 2 +- src/bin/pg_waldump/pg_waldump.c | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c index e437c42992..d37bae47f8 100644 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@ -1207,7 +1207,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); report_invalid_record(state, - "invalid magic number %04X in log segment %s, offset %u", + "invalid magic number %04X in WAL segment %s, offset %u", hdr->xlp_magic, fname, offset); @@ -1221,7 +1221,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); report_invalid_record(state, - "invalid info bits %04X in log segment %s, offset %u", + "invalid info bits %04X in WAL segment %s, offset %u", hdr->xlp_info, fname, offset); @@ -1262,7 +1262,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, /* hmm, first page of file doesn't have a long header? */ report_invalid_record(state, - "invalid info bits %04X in log segment %s, offset %u", + "invalid info bits %04X in WAL segment %s, offset %u", hdr->xlp_info, fname, offset); @@ -1281,7 +1281,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); report_invalid_record(state, - "unexpected pageaddr %X/%X in log segment %s, offset %u", + "unexpected pageaddr %X/%X in WAL segment %s, offset %u", LSN_FORMAT_ARGS(hdr->xlp_pageaddr), fname, offset); @@ -1306,7 +1306,7 @@ XLogReaderValidatePageHeader(XLogReaderState *state, XLogRecPtr recptr, XLogFileName(fname, state->seg.ws_tli, segno, state->segcxt.ws_segsize); report_invalid_record(state, - "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u", + "out-of-sequence timeline ID %u (after %u) in WAL segment %s, offset %u", hdr->xlp_tli, state->latestPageTLI, fname, diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index 8b22c4e634..f3909213fe 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -2998,7 +2998,7 @@ ReadRecord(XLogReaderState *xlogreader, int emode, XLogFileName(fname, xlogreader->seg.ws_tli, segno, wal_segment_size); ereport(emode_for_corrupt_record(emode, xlogreader->EndRecPtr), - (errmsg("unexpected timeline ID %u in log segment %s, offset %u", + (errmsg("unexpected timeline ID %u in WAL segment %s, offset %u", xlogreader->latestPageTLI, fname, offset))); @@ -3189,13 +3189,13 @@ retry: errno = save_errno; ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen), (errcode_for_file_access(), - errmsg("could not read from log segment %s, offset %u: %m", + errmsg("could not read from WAL segment %s, offset %u: %m", fname, readOff))); } else ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen), (errcode(ERRCODE_DATA_CORRUPTED), - errmsg("could not read from log segment %s, offset %u: read %d of %zu", + errmsg("could not read from WAL segment %s, offset %u: read %d of %zu", fname, readOff, r, (Size) XLOG_BLCKSZ))); goto next_record_is_invalid; } diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c index 8c1b8216be..e49f534c5c 100644 --- a/src/backend/access/transam/xlogutils.c +++ b/src/backend/access/transam/xlogutils.c @@ -1142,14 +1142,14 @@ WALReadRaiseError(WALReadError *errinfo) errno = errinfo->wre_errno; ereport(ERROR, (errcode_for_file_access(), - errmsg("could not read from log segment %s, offset %d: %m", + errmsg("could not read from WAL segment %s, offset %d: %m", fname, errinfo->wre_off))); } else if (errinfo->wre_read == 0) { ereport(ERROR, (errcode(ERRCODE_DATA_CORRUPTED), - errmsg("could not read from log segment %s, offset %d: read %d of %d", + errmsg("could not read from WAL segment %s, offset %d: read %d of %d", fname, errinfo->wre_off, errinfo->wre_read, errinfo->wre_req))); } diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index ceaff097b9..94b3f0d016 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -616,7 +616,7 @@ WalReceiverMain(void) if (close(recvFile) != 0) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not close log segment %s: %m", + errmsg("could not close WAL segment %s: %m", xlogfname))); /* @@ -930,7 +930,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) errno = save_errno; ereport(PANIC, (errcode_for_file_access(), - errmsg("could not write to log segment %s " + errmsg("could not write to WAL segment %s " "at offset %u, length %lu: %m", xlogfname, startoff, (unsigned long) segbytes))); } @@ -1042,7 +1042,7 @@ XLogWalRcvClose(XLogRecPtr recptr, TimeLineID tli) if (close(recvFile) != 0) ereport(PANIC, (errcode_for_file_access(), - errmsg("could not close log segment %s: %m", + errmsg("could not close WAL segment %s: %m", xlogfname))); /* diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c index 1eb4509fca..a8e8d6f67f 100644 --- a/src/bin/pg_resetwal/pg_resetwal.c +++ b/src/bin/pg_resetwal/pg_resetwal.c @@ -837,7 +837,7 @@ PrintNewControlValues(void) XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID, newXlogSegNo, WalSegSz); - printf(_("First log segment after reset: %s\n"), fname); + printf(_("First WAL segment after reset: %s\n"), fname); if (set_mxid != 0) { diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index 41b8f69b8c..67a964ace4 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -346,7 +346,7 @@ get_control_data(ClusterInfo *cluster, bool live_check) cluster->controldata.chkpnt_nxtmxoff = str2uint(p); got_mxoff = true; } - else if ((p = strstr(bufin, "First log segment after reset:")) != NULL) + else if ((p = strstr(bufin, "First WAL segment after reset:")) != NULL) { /* Skip the colon and any whitespace after it */ p = strchr(p, ':'); diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c index 9ffe9e55bd..7a57f64722 100644 --- a/src/bin/pg_waldump/pg_waldump.c +++ b/src/bin/pg_waldump/pg_waldump.c @@ -831,7 +831,7 @@ usage(void) printf(_(" -F, --fork=FORK only show records that modify blocks in fork FORK;\n" " valid names are main, fsm, vm, init\n")); printf(_(" -n, --limit=N number of records to display\n")); - printf(_(" -p, --path=PATH directory in which to find log segment files or a\n" + printf(_(" -p, --path=PATH directory in which to find WAL segment files or a\n" " directory with a ./pg_wal that contains such files\n" " (default: current directory, ./pg_wal, $PGDATA/pg_wal)\n")); printf(_(" -q, --quiet do not print any output, except for errors\n")); @@ -839,7 +839,7 @@ usage(void) " use --rmgr=list to list valid resource manager names\n")); printf(_(" -R, --relation=T/D/R only show records that modify blocks in relation T/D/R\n")); printf(_(" -s, --start=RECPTR start reading at WAL location RECPTR\n")); - printf(_(" -t, --timeline=TLI timeline from which to read log records\n" + printf(_(" -t, --timeline=TLI timeline from which to read WAL records\n" " (default: 1 or the value used in STARTSEG)\n")); printf(_(" -V, --version output version information, then exit\n")); printf(_(" -w, --fullpage only show records with a full page write\n")); -- 2.25.1