database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-12 21:01:52 +03:00
Code Activity

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2024-08-29 14:43:34 +02:00
parent 894be11adf
commit edee0c621d
23 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/replication/logical/logical.c
View File

@ -539,7 +539,7 @@ CreateDecodingContext(XLogRecPtr start_lsn,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("cannot use replication slot \"%s\" for logical decoding",
NameStr(slot->data.name)),
errdetail("This slot is being synchronized from the primary server."),
errdetail("This replication slot is being synchronized from the primary server."),
errhint("Specify another replication slot."));
/*

43
src/backend/replication/logical/slotsync.c
View File

@ -212,9 +212,9 @@ update_local_synced_slot(RemoteSlot *remote_slot, Oid remote_dbid,
* impact the users, so we used DEBUG1 level to log the message.
*/
ereport(slot->data.persistency == RS_TEMPORARY ? LOG : DEBUG1,
errmsg("could not sync slot \"%s\" as remote slot precedes local slot",
errmsg("could not synchronize replication slot \"%s\" because remote slot precedes local slot",
remote_slot->name),
errdetail("Remote slot has LSN %X/%X and catalog xmin %u, but local slot has LSN %X/%X and catalog xmin %u.",
errdetail("The remote slot has LSN %X/%X and catalog xmin %u, but the local slot has LSN %X/%X and catalog xmin %u.",
LSN_FORMAT_ARGS(remote_slot->restart_lsn),
remote_slot->catalog_xmin,
LSN_FORMAT_ARGS(slot->data.restart_lsn),
@ -456,7 +456,7 @@ drop_local_obsolete_slots(List *remote_slot_list)
0, AccessShareLock);
ereport(LOG,
errmsg("dropped replication slot \"%s\" of dbid %u",
errmsg("dropped replication slot \"%s\" of database with OID %u",
NameStr(local_slot->data.name),
local_slot->data.database));
}
@ -576,8 +576,8 @@ update_and_persist_local_synced_slot(RemoteSlot *remote_slot, Oid remote_dbid)
if (!found_consistent_snapshot)
{
ereport(LOG,
errmsg("could not sync slot \"%s\"", remote_slot->name),
errdetail("Logical decoding cannot find consistent point from local slot's LSN %X/%X.",
errmsg("could not synchronize replication slot \"%s\"", remote_slot->name),
errdetail("Logical decoding could not find consistent point from local slot's LSN %X/%X.",
LSN_FORMAT_ARGS(slot->data.restart_lsn)));
return false;
@ -586,7 +586,7 @@ update_and_persist_local_synced_slot(RemoteSlot *remote_slot, Oid remote_dbid)
ReplicationSlotPersist();
ereport(LOG,
errmsg("newly created slot \"%s\" is sync-ready now",
errmsg("newly created replication slot \"%s\" is sync-ready now",
remote_slot->name));
return true;
@ -625,7 +625,7 @@ synchronize_one_slot(RemoteSlot *remote_slot, Oid remote_dbid)
*/
ereport(AmLogicalSlotSyncWorkerProcess() ? LOG : ERROR,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("skipping slot synchronization as the received slot sync"
errmsg("skipping slot synchronization because the received slot sync"
" LSN %X/%X for slot \"%s\" is ahead of the standby position %X/%X",
LSN_FORMAT_ARGS(remote_slot->confirmed_lsn),
remote_slot->name,
@ -992,10 +992,9 @@ validate_remote_info(WalReceiverConn *wrconn)
if (!primary_slot_valid)
ereport(ERROR,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("slot synchronization requires valid primary_slot_name"),
/* translator: second %s is a GUC variable name */
errdetail("The replication slot \"%s\" specified by %s does not exist on the primary server.",
PrimarySlotName, "primary_slot_name"));
errmsg("replication slot \"%s\" specified by \"%s\" does not exist on primary server",
PrimarySlotName, "primary_slot_name"));
ExecClearTuple(tupslot);
walrcv_clear_result(res);
@ -1022,9 +1021,13 @@ CheckAndGetDbnameFromConninfo(void)
if (dbname == NULL)
ereport(ERROR,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
/* translator: dbname is a specific option; %s is a GUC variable name */
errmsg("slot synchronization requires dbname to be specified in %s",
"primary_conninfo"));
/*
* translator: first %s is a connection option; second %s is a GUC
* variable name
*/
errmsg("replication slot synchronization requires \"%s\" to be specified in \"%s\"",
"dbname", "primary_conninfo"));
return dbname;
}
@ -1044,7 +1047,7 @@ ValidateSlotSyncParams(int elevel)
if (wal_level < WAL_LEVEL_LOGICAL)
ereport(ERROR,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("slot synchronization requires \"wal_level\" >= \"logical\""));
errmsg("replication slot synchronization requires \"wal_level\" >= \"logical\""));
/*
* A physical replication slot(primary_slot_name) is required on the
@ -1057,7 +1060,7 @@ ValidateSlotSyncParams(int elevel)
ereport(elevel,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
/* translator: %s is a GUC variable name */
errmsg("slot synchronization requires %s to be defined", "primary_slot_name"));
errmsg("replication slot synchronization requires \"%s\" to be set", "primary_slot_name"));
return false;
}
@ -1071,7 +1074,7 @@ ValidateSlotSyncParams(int elevel)
ereport(elevel,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
/* translator: %s is a GUC variable name */
errmsg("slot synchronization requires %s to be enabled",
errmsg("replication slot synchronization requires \"%s\" to be enabled",
"hot_standby_feedback"));
return false;
}
@ -1085,7 +1088,7 @@ ValidateSlotSyncParams(int elevel)
ereport(elevel,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
/* translator: %s is a GUC variable name */
errmsg("slot synchronization requires %s to be defined",
errmsg("replication slot synchronization requires \"%s\" to be set",
"primary_conninfo"));
return false;
}
@ -1123,7 +1126,7 @@ slotsync_reread_config(void)
{
ereport(LOG,
/* translator: %s is a GUC variable name */
errmsg("slot sync worker will shutdown because %s is disabled", "sync_replication_slots"));
errmsg("replication slot synchronization worker will shut down because \"%s\" is disabled", "sync_replication_slots"));
proc_exit(0);
}
@ -1132,7 +1135,7 @@ slotsync_reread_config(void)
(old_hot_standby_feedback != hot_standby_feedback))
{
ereport(LOG,
errmsg("slot sync worker will restart because of a parameter change"));
errmsg("replication slot synchronization worker will restart because of a parameter change"));
/*
* Reset the last-start time for this worker so that the postmaster
@ -1156,7 +1159,7 @@ ProcessSlotSyncInterrupts(WalReceiverConn *wrconn)
if (ShutdownRequestPending)
{
ereport(LOG,
errmsg("slot sync worker is shutting down on receiving SIGINT"));
errmsg("replication slot synchronization worker is shutting down on receiving SIGINT"));
proc_exit(0);
}

4
src/backend/replication/pgoutput/pgoutput.c
View File

@ -404,11 +404,11 @@ parse_output_parameters(List *options, PGOutputData *data)
if (!protocol_version_given)
ereport(ERROR,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("proto_version option missing"));
errmsg("option \"%s\" missing", "proto_version"));
if (!publication_names_given)
ereport(ERROR,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("publication_names option missing"));
errmsg("option \"%s\" missing", "publication_names"));
}
/*

28
src/backend/replication/slot.c
View File

@ -795,7 +795,7 @@ ReplicationSlotDrop(const char *name, bool nowait)
ereport(ERROR,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("cannot drop replication slot \"%s\"", name),
errdetail("This slot is being synced from the primary server."));
errdetail("This replication slot is being synchronized from the primary server."));
ReplicationSlotDropAcquired();
}
@ -830,7 +830,7 @@ ReplicationSlotAlter(const char *name, const bool *failover,
ereport(ERROR,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("cannot alter replication slot \"%s\"", name),
errdetail("This slot is being synced from the primary server."));
errdetail("This replication slot is being synchronized from the primary server."));
/*
* Do not allow users to enable failover on the standby as we do not
@ -2656,11 +2656,11 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
*/
ereport(elevel,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("replication slot \"%s\" specified in parameter %s does not exist",
errmsg("replication slot \"%s\" specified in parameter \"%s\" does not exist",
name, "synchronized_standby_slots"),
errdetail("Logical replication is waiting on the standby associated with \"%s\".",
errdetail("Logical replication is waiting on the standby associated with replication slot \"%s\".",
name),
errhint("Consider creating the slot \"%s\" or amend parameter %s.",
errhint("Create the replication slot \"%s\" or amend parameter \"%s\".",
name, "synchronized_standby_slots"));
break;
}
@ -2677,11 +2677,11 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
*/
ereport(elevel,
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("cannot have logical replication slot \"%s\" in parameter %s",
errmsg("cannot specify logical replication slot \"%s\" in parameter \"%s\"",
name, "synchronized_standby_slots"),
errdetail("Logical replication is waiting for correction on \"%s\".",
errdetail("Logical replication is waiting for correction on replication slot \"%s\".",
name),
errhint("Consider removing logical slot \"%s\" from parameter %s.",
errhint("Remove the logical replication slot \"%s\" from parameter \"%s\".",
name, "synchronized_standby_slots"));
break;
}
@ -2697,11 +2697,11 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
/* Specified physical slot has been invalidated */
ereport(elevel,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("physical slot \"%s\" specified in parameter %s has been invalidated",
errmsg("physical replication slot \"%s\" specified in parameter \"%s\" has been invalidated",
name, "synchronized_standby_slots"),
errdetail("Logical replication is waiting on the standby associated with \"%s\".",
errdetail("Logical replication is waiting on the standby associated with replication slot \"%s\".",
name),
errhint("Consider dropping and recreating the slot \"%s\" or amend parameter %s.",
errhint("Drop and recreate the replication slot \"%s\", or amend parameter \"%s\".",
name, "synchronized_standby_slots"));
break;
}
@ -2712,11 +2712,11 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
if (inactive)
ereport(elevel,
errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("replication slot \"%s\" specified in parameter %s does not have active_pid",
errmsg("replication slot \"%s\" specified in parameter \"%s\" does not have active_pid",
name, "synchronized_standby_slots"),
errdetail("Logical replication is waiting on the standby associated with \"%s\".",
errdetail("Logical replication is waiting on the standby associated with replication slot \"%s\".",
name),
errhint("Consider starting standby associated with \"%s\" or amend parameter %s.",
errhint("Start the standby associated with the replication slot \"%s\", or amend parameter \"%s\".",
name, "synchronized_standby_slots"));
/* Continue if the current slot hasn't caught up. */