Commit 626092a2 authored by Peter Eisentraut's avatar Peter Eisentraut

Message style improvements

parent 815fcd05
...@@ -150,7 +150,7 @@ readTimeLineHistory(TimeLineID targetTLI) ...@@ -150,7 +150,7 @@ readTimeLineHistory(TimeLineID targetTLI)
if (nfields != 3) if (nfields != 3)
ereport(FATAL, ereport(FATAL,
(errmsg("syntax error in history file: %s", fline), (errmsg("syntax error in history file: %s", fline),
errhint("Expected an XLOG switchpoint location."))); errhint("Expected a transaction log switchpoint location.")));
if (result && tli <= lasttli) if (result && tli <= lasttli)
ereport(FATAL, ereport(FATAL,
......
...@@ -3721,7 +3721,7 @@ XLogFileOpen(XLogSegNo segno) ...@@ -3721,7 +3721,7 @@ XLogFileOpen(XLogSegNo segno)
if (fd < 0) if (fd < 0)
ereport(PANIC, ereport(PANIC,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not open xlog file \"%s\": %m", path))); errmsg("could not open transaction log file \"%s\": %m", path)));
return fd; return fd;
} }
...@@ -6281,7 +6281,7 @@ StartupXLOG(void) ...@@ -6281,7 +6281,7 @@ StartupXLOG(void)
ereport(FATAL, ereport(FATAL,
(errmsg("requested timeline %u is not a child of this server's history", (errmsg("requested timeline %u is not a child of this server's history",
recoveryTargetTLI), recoveryTargetTLI),
errdetail("Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X", errdetail("Latest checkpoint is at %X/%X on timeline %u, but in the history of the requested timeline, the server forked off from that timeline at %X/%X.",
(uint32) (ControlFile->checkPoint >> 32), (uint32) (ControlFile->checkPoint >> 32),
(uint32) ControlFile->checkPoint, (uint32) ControlFile->checkPoint,
ControlFile->checkPointCopy.ThisTimeLineID, ControlFile->checkPointCopy.ThisTimeLineID,
...@@ -9027,7 +9027,7 @@ checkTimeLineSwitch(XLogRecPtr lsn, TimeLineID newTLI, TimeLineID prevTLI) ...@@ -9027,7 +9027,7 @@ checkTimeLineSwitch(XLogRecPtr lsn, TimeLineID newTLI, TimeLineID prevTLI)
/* Check that the record agrees on what the current (old) timeline is */ /* Check that the record agrees on what the current (old) timeline is */
if (prevTLI != ThisTimeLineID) if (prevTLI != ThisTimeLineID)
ereport(PANIC, ereport(PANIC,
(errmsg("unexpected prev timeline ID %u (current timeline ID %u) in checkpoint record", (errmsg("unexpected previous timeline ID %u (current timeline ID %u) in checkpoint record",
prevTLI, ThisTimeLineID))); prevTLI, ThisTimeLineID)));
/* /*
......
...@@ -438,7 +438,7 @@ WalReceiverMain(void) ...@@ -438,7 +438,7 @@ WalReceiverMain(void)
{ {
ereport(LOG, ereport(LOG,
(errmsg("replication terminated by primary server"), (errmsg("replication terminated by primary server"),
errdetail("End of WAL reached on timeline %u at %X/%X", errdetail("End of WAL reached on timeline %u at %X/%X.",
startpointTLI, startpointTLI,
(uint32) (LogstreamResult.Write >> 32), (uint32) LogstreamResult.Write))); (uint32) (LogstreamResult.Write >> 32), (uint32) LogstreamResult.Write)));
endofwal = true; endofwal = true;
...@@ -927,7 +927,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr) ...@@ -927,7 +927,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
if (lseek(recvFile, (off_t) startoff, SEEK_SET) < 0) if (lseek(recvFile, (off_t) startoff, SEEK_SET) < 0)
ereport(PANIC, ereport(PANIC,
(errcode_for_file_access(), (errcode_for_file_access(),
errmsg("could not seek in log segment %s, to offset %u: %m", errmsg("could not seek in log segment %s to offset %u: %m",
XLogFileNameP(recvFileTLI, recvSegNo), XLogFileNameP(recvFileTLI, recvSegNo),
startoff))); startoff)));
recvOff = startoff; recvOff = startoff;
......
...@@ -485,7 +485,7 @@ StartReplication(StartReplicationCmd *cmd) ...@@ -485,7 +485,7 @@ StartReplication(StartReplicationCmd *cmd)
(uint32) (cmd->startpoint >> 32), (uint32) (cmd->startpoint >> 32),
(uint32) (cmd->startpoint), (uint32) (cmd->startpoint),
cmd->timeline), cmd->timeline),
errdetail("This server's history forked from timeline %u at %X/%X", errdetail("This server's history forked from timeline %u at %X/%X.",
cmd->timeline, cmd->timeline,
(uint32) (switchpoint >> 32), (uint32) (switchpoint >> 32),
(uint32) (switchpoint)))); (uint32) (switchpoint))));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment