Message style improvements
This commit is contained in:
parent
815fcd050f
commit
626092a2e1
|
@ -150,7 +150,7 @@ readTimeLineHistory(TimeLineID targetTLI)
|
|||
if (nfields != 3)
|
||||
ereport(FATAL,
|
||||
(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)
|
||||
ereport(FATAL,
|
||||
|
|
|
@ -3721,7 +3721,7 @@ XLogFileOpen(XLogSegNo segno)
|
|||
if (fd < 0)
|
||||
ereport(PANIC,
|
||||
(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;
|
||||
}
|
||||
|
@ -6281,7 +6281,7 @@ StartupXLOG(void)
|
|||
ereport(FATAL,
|
||||
(errmsg("requested timeline %u is not a child of this server's history",
|
||||
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,
|
||||
ControlFile->checkPointCopy.ThisTimeLineID,
|
||||
|
@ -9027,7 +9027,7 @@ checkTimeLineSwitch(XLogRecPtr lsn, TimeLineID newTLI, TimeLineID prevTLI)
|
|||
/* Check that the record agrees on what the current (old) timeline is */
|
||||
if (prevTLI != ThisTimeLineID)
|
||||
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)));
|
||||
|
||||
/*
|
||||
|
|
|
@ -438,7 +438,7 @@ WalReceiverMain(void)
|
|||
{
|
||||
ereport(LOG,
|
||||
(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,
|
||||
(uint32) (LogstreamResult.Write >> 32), (uint32) LogstreamResult.Write)));
|
||||
endofwal = true;
|
||||
|
@ -927,7 +927,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
|
|||
if (lseek(recvFile, (off_t) startoff, SEEK_SET) < 0)
|
||||
ereport(PANIC,
|
||||
(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),
|
||||
startoff)));
|
||||
recvOff = startoff;
|
||||
|
|
|
@ -485,7 +485,7 @@ StartReplication(StartReplicationCmd *cmd)
|
|||
(uint32) (cmd->startpoint >> 32),
|
||||
(uint32) (cmd->startpoint),
|
||||
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,
|
||||
(uint32) (switchpoint >> 32),
|
||||
(uint32) (switchpoint))));
|
||||
|
|
Loading…
Reference in New Issue