database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

Improve style of some replication-related error messages.

Browse Source 
Put the remote end's error message into the primary error string,
instead of relegating it to errdetail().  Although this could end up
being awkward if the remote sends us a really long error message,
it seems more in keeping with our message style guidelines, and more
helpful in situations where the errdetail could get dropped.

Peter Smith

Discussion: https://postgr.es/m/CAHut+Ps-Qv2yQceCwobQDP0aJOkfDzRFrOaR6+2Op2K=WHGeWg@mail.gmail.com
This commit is contained in:
Tom Lane
2021-03-31 15:25:53 -04:00
parent db973ffb3c
commit 6197db5340
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/commands/subscriptioncmds.c
View File

@ -1320,17 +1320,15 @@ ReplicationSlotDropAtPubNode(WalReceiverConn *wrconn, char *slotname, bool missi
{ {
/* LOG. Error, but missing_ok = true. */ /* LOG. Error, but missing_ok = true. */
ereport(LOG, ereport(LOG,
(errmsg("could not drop the replication slot \"%s\" on publisher", (errmsg("could not drop replication slot \"%s\" on publisher: %s",
slotname), slotname, res->err)));
errdetail("The error was: %s", res->err)));
} }
else else
{ {
/* ERROR. */ /* ERROR. */
ereport(ERROR, ereport(ERROR,
(errmsg("could not drop the replication slot \"%s\" on publisher", (errmsg("could not drop replication slot \"%s\" on publisher: %s",
slotname), slotname, res->err)));
errdetail("The error was: %s", res->err)));
} }
walrcv_clear_result(res); walrcv_clear_result(res);
@ -1545,8 +1543,7 @@ ReportSlotConnectionError(List *rstates, Oid subid, char *slotname, char *err)
ereport(ERROR, ereport(ERROR,
(errmsg("could not connect to publisher when attempting to " (errmsg("could not connect to publisher when attempting to "
"drop the replication slot \"%s\"", slotname), "drop replication slot \"%s\": %s", slotname, err),
errdetail("The error was: %s", err),
/* translator: %s is an SQL ALTER command */ /* translator: %s is an SQL ALTER command */
errhint("Use %s to disassociate the subscription from the slot.", errhint("Use %s to disassociate the subscription from the slot.",
"ALTER SUBSCRIPTION ... SET (slot_name = NONE)"))); "ALTER SUBSCRIPTION ... SET (slot_name = NONE)")));

8
src/backend/replication/logical/tablesync.c
View File

@ -1043,8 +1043,8 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
0, NULL); 0, NULL);
if (res->status != WALRCV_OK_COMMAND) if (res->status != WALRCV_OK_COMMAND)
ereport(ERROR, ereport(ERROR,
(errmsg("table copy could not start transaction on publisher"), (errmsg("table copy could not start transaction on publisher: %s",
errdetail("The error was: %s", res->err))); res->err)));
walrcv_clear_result(res); walrcv_clear_result(res);
/* /*
@ -1103,8 +1103,8 @@ LogicalRepSyncTableStart(XLogRecPtr *origin_startpos)
res = walrcv_exec(wrconn, "COMMIT", 0, NULL); res = walrcv_exec(wrconn, "COMMIT", 0, NULL);
if (res->status != WALRCV_OK_COMMAND) if (res->status != WALRCV_OK_COMMAND)
ereport(ERROR, ereport(ERROR,
(errmsg("table copy could not finish transaction on publisher"), (errmsg("table copy could not finish transaction on publisher: %s",
errdetail("The error was: %s", res->err))); res->err)));
walrcv_clear_result(res); walrcv_clear_result(res);
table_close(rel, NoLock); table_close(rel, NoLock);