mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-03 02:57:19 +02:00
Message improvements
This commit is contained in:
parent
1c73485c69
commit
8fb4218ef4
@ -1590,7 +1590,7 @@ auth_peer(hbaPort *port)
|
|||||||
if (!pw)
|
if (!pw)
|
||||||
{
|
{
|
||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("failed to look up local user id %ld: %s",
|
(errmsg("could not to look up local user ID %ld: %s",
|
||||||
(long) uid, errno ? strerror(errno) : _("user does not exist"))));
|
(long) uid, errno ? strerror(errno) : _("user does not exist"))));
|
||||||
return STATUS_ERROR;
|
return STATUS_ERROR;
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,7 @@ CreateInitDecodingContext(char *plugin,
|
|||||||
if (slot->data.database == InvalidOid)
|
if (slot->data.database == InvalidOid)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
|
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
|
||||||
errmsg("cannot use physical replication slot created for logical decoding")));
|
errmsg("cannot use physical replication slot for logical decoding")));
|
||||||
|
|
||||||
if (slot->data.database != MyDatabaseId)
|
if (slot->data.database != MyDatabaseId)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
@ -410,7 +410,7 @@ CreateDecodingContext(XLogRecPtr start_lsn,
|
|||||||
MemoryContextSwitchTo(old_context);
|
MemoryContextSwitchTo(old_context);
|
||||||
|
|
||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("starting logical decoding for slot %s",
|
(errmsg("starting logical decoding for slot \"%s\"",
|
||||||
NameStr(slot->data.name)),
|
NameStr(slot->data.name)),
|
||||||
errdetail("streaming transactions committing after %X/%X, reading WAL from %X/%X",
|
errdetail("streaming transactions committing after %X/%X, reading WAL from %X/%X",
|
||||||
(uint32) (slot->data.confirmed_flush >> 32),
|
(uint32) (slot->data.confirmed_flush >> 32),
|
||||||
|
@ -2198,7 +2198,7 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
|
|||||||
else if (readBytes != sizeof(ReorderBufferDiskChange))
|
else if (readBytes != sizeof(ReorderBufferDiskChange))
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("incomplete read from reorderbuffer spill file: read %d instead of %u bytes",
|
errmsg("could not read from reorderbuffer spill file: read %d instead of %u bytes",
|
||||||
readBytes,
|
readBytes,
|
||||||
(uint32) sizeof(ReorderBufferDiskChange))));
|
(uint32) sizeof(ReorderBufferDiskChange))));
|
||||||
|
|
||||||
|
@ -598,7 +598,9 @@ SnapBuildExportSnapshot(SnapBuild *builder)
|
|||||||
snapname = ExportSnapshot(snap);
|
snapname = ExportSnapshot(snap);
|
||||||
|
|
||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("exported logical decoding snapshot: \"%s\" with %u xids",
|
(errmsg_plural("exported logical decoding snapshot: \"%s\" with %u transaction ID",
|
||||||
|
"exported logical decoding snapshot: \"%s\" with %u transaction IDs",
|
||||||
|
snap->xcnt,
|
||||||
snapname, snap->xcnt)));
|
snapname, snap->xcnt)));
|
||||||
return snapname;
|
return snapname;
|
||||||
}
|
}
|
||||||
@ -901,7 +903,7 @@ SnapBuildEndTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid)
|
|||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("logical decoding found consistent point at %X/%X",
|
(errmsg("logical decoding found consistent point at %X/%X",
|
||||||
(uint32) (lsn >> 32), (uint32) lsn),
|
(uint32) (lsn >> 32), (uint32) lsn),
|
||||||
errdetail("xid %u finished, no running transactions anymore",
|
errdetail("Transaction ID %u finished; no more running transactions.",
|
||||||
xid)));
|
xid)));
|
||||||
builder->state = SNAPBUILD_CONSISTENT;
|
builder->state = SNAPBUILD_CONSISTENT;
|
||||||
}
|
}
|
||||||
@ -1228,9 +1230,9 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
|
|||||||
builder->initial_xmin_horizon))
|
builder->initial_xmin_horizon))
|
||||||
{
|
{
|
||||||
ereport(DEBUG1,
|
ereport(DEBUG1,
|
||||||
(errmsg("skipping snapshot at %X/%X while building logical decoding snapshot, xmin horizon too low",
|
(errmsg_internal("skipping snapshot at %X/%X while building logical decoding snapshot, xmin horizon too low",
|
||||||
(uint32) (lsn >> 32), (uint32) lsn),
|
(uint32) (lsn >> 32), (uint32) lsn),
|
||||||
errdetail("initial xmin horizon of %u vs the snapshot's %u",
|
errdetail_internal("initial xmin horizon of %u vs the snapshot's %u",
|
||||||
builder->initial_xmin_horizon, running->oldestRunningXid)));
|
builder->initial_xmin_horizon, running->oldestRunningXid)));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1324,7 +1326,10 @@ SnapBuildFindSnapshot(SnapBuild *builder, XLogRecPtr lsn, xl_running_xacts *runn
|
|||||||
ereport(LOG,
|
ereport(LOG,
|
||||||
(errmsg("logical decoding found initial starting point at %X/%X",
|
(errmsg("logical decoding found initial starting point at %X/%X",
|
||||||
(uint32) (lsn >> 32), (uint32) lsn),
|
(uint32) (lsn >> 32), (uint32) lsn),
|
||||||
errdetail("%u xacts need to finish", (uint32) builder->running.xcnt)));
|
errdetail_plural("%u transaction needs to finish.",
|
||||||
|
"%u transactions need to finish.",
|
||||||
|
builder->running.xcnt,
|
||||||
|
(uint32) builder->running.xcnt)));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Iterate through all xids, wait for them to finish.
|
* Iterate through all xids, wait for them to finish.
|
||||||
|
@ -797,8 +797,7 @@ CheckPointReplicationSlots(void)
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
ereport(DEBUG1,
|
elog(DEBUG1, "performing replication slot checkpoint");
|
||||||
(errmsg("performing replication slot checkpoint")));
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Prevent any slot from being created/dropped while we're active. As we
|
* Prevent any slot from being created/dropped while we're active. As we
|
||||||
@ -834,8 +833,7 @@ StartupReplicationSlots(void)
|
|||||||
DIR *replication_dir;
|
DIR *replication_dir;
|
||||||
struct dirent *replication_de;
|
struct dirent *replication_de;
|
||||||
|
|
||||||
ereport(DEBUG1,
|
elog(DEBUG1, "starting up replication slots");
|
||||||
(errmsg("starting up replication slots")));
|
|
||||||
|
|
||||||
/* restore all slots by iterating over all on-disk entries */
|
/* restore all slots by iterating over all on-disk entries */
|
||||||
replication_dir = AllocateDir("pg_replslot");
|
replication_dir = AllocateDir("pg_replslot");
|
||||||
|
@ -895,7 +895,7 @@ static struct config_bool ConfigureNamesBool[] =
|
|||||||
|
|
||||||
{
|
{
|
||||||
{"wal_log_hints", PGC_POSTMASTER, WAL_SETTINGS,
|
{"wal_log_hints", PGC_POSTMASTER, WAL_SETTINGS,
|
||||||
gettext_noop("Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modifications"),
|
gettext_noop("Writes full pages to WAL when first modified after a checkpoint, even for a non-critical modifications."),
|
||||||
NULL
|
NULL
|
||||||
},
|
},
|
||||||
&wal_log_hints,
|
&wal_log_hints,
|
||||||
@ -3483,7 +3483,7 @@ static struct config_enum ConfigureNamesEnum[] =
|
|||||||
|
|
||||||
{
|
{
|
||||||
{"huge_pages", PGC_POSTMASTER, RESOURCES_MEM,
|
{"huge_pages", PGC_POSTMASTER, RESOURCES_MEM,
|
||||||
gettext_noop("Use of huge pages on Linux"),
|
gettext_noop("Use of huge pages on Linux."),
|
||||||
NULL
|
NULL
|
||||||
},
|
},
|
||||||
&huge_pages,
|
&huge_pages,
|
||||||
@ -6564,7 +6564,7 @@ write_auto_conf_file(int fd, const char *filename, ConfigVariable **head_p)
|
|||||||
*/
|
*/
|
||||||
if (write(fd, buf.data, buf.len) < 0)
|
if (write(fd, buf.data, buf.len) < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errmsg("failed to write to \"%s\" file", filename)));
|
(errmsg("could not write to file \"%s\": %m", filename)));
|
||||||
resetStringInfo(&buf);
|
resetStringInfo(&buf);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -6589,7 +6589,7 @@ write_auto_conf_file(int fd, const char *filename, ConfigVariable **head_p)
|
|||||||
|
|
||||||
if (write(fd, buf.data, buf.len) < 0)
|
if (write(fd, buf.data, buf.len) < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errmsg("failed to write to \"%s\" file", filename)));
|
(errmsg("could not write to file \"%s\": %m", filename)));
|
||||||
resetStringInfo(&buf);
|
resetStringInfo(&buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -6792,7 +6792,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
|
|||||||
if (Tmpfd < 0)
|
if (Tmpfd < 0)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errcode_for_file_access(),
|
(errcode_for_file_access(),
|
||||||
errmsg("failed to open auto conf temp file \"%s\": %m ",
|
errmsg("could not open file \"%s\": %m",
|
||||||
AutoConfTmpFileName)));
|
AutoConfTmpFileName)));
|
||||||
|
|
||||||
PG_TRY();
|
PG_TRY();
|
||||||
@ -6810,7 +6810,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
|
|||||||
infile = AllocateFile(AutoConfFileName, "r");
|
infile = AllocateFile(AutoConfFileName, "r");
|
||||||
if (infile == NULL)
|
if (infile == NULL)
|
||||||
ereport(ERROR,
|
ereport(ERROR,
|
||||||
(errmsg("failed to open auto conf file \"%s\": %m ",
|
(errmsg("could not open file \"%s\": %m",
|
||||||
AutoConfFileName)));
|
AutoConfFileName)));
|
||||||
|
|
||||||
/* parse it */
|
/* parse it */
|
||||||
|
Loading…
Reference in New Issue
Block a user