Message style fixes
This commit is contained in:
parent
25996a82a4
commit
144cefac92
|
@ -3876,7 +3876,7 @@ maybe_start_skipping_changes(XLogRecPtr finish_lsn)
|
|||
skip_xact_finish_lsn = finish_lsn;
|
||||
|
||||
ereport(LOG,
|
||||
errmsg("start skipping logical replication transaction finished at %X/%X",
|
||||
errmsg("logical replication starts skipping transaction at LSN %X/%X",
|
||||
LSN_FORMAT_ARGS(skip_xact_finish_lsn)));
|
||||
}
|
||||
|
||||
|
@ -3890,7 +3890,7 @@ stop_skipping_changes(void)
|
|||
return;
|
||||
|
||||
ereport(LOG,
|
||||
(errmsg("done skipping logical replication transaction finished at %X/%X",
|
||||
(errmsg("logical replication completed skipping transaction at LSN %X/%X",
|
||||
LSN_FORMAT_ARGS(skip_xact_finish_lsn))));
|
||||
|
||||
/* Stop skipping changes */
|
||||
|
@ -3973,7 +3973,7 @@ clear_subscription_skip_lsn(XLogRecPtr finish_lsn)
|
|||
if (myskiplsn != finish_lsn)
|
||||
ereport(WARNING,
|
||||
errmsg("skip-LSN of logical replication subscription \"%s\" cleared", MySubscription->name),
|
||||
errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X",
|
||||
errdetail("Remote transaction's finish WAL location (LSN) %X/%X did not match skip-LSN %X/%X.",
|
||||
LSN_FORMAT_ARGS(finish_lsn),
|
||||
LSN_FORMAT_ARGS(myskiplsn)));
|
||||
}
|
||||
|
|
|
@ -453,9 +453,10 @@ CheckMyDatabase(const char *name, bool am_superuser, bool override_allow_connect
|
|||
|
||||
actual_versionstr = get_collation_actual_version(dbform->datlocprovider, dbform->datlocprovider == COLLPROVIDER_ICU ? iculocale : collate);
|
||||
if (!actual_versionstr)
|
||||
ereport(WARNING,
|
||||
(errmsg("database \"%s\" has no actual collation version, but a version was recorded",
|
||||
name)));
|
||||
/* should not happen */
|
||||
elog(WARNING,
|
||||
"database \"%s\" has no actual collation version, but a version was recorded",
|
||||
name);
|
||||
else if (strcmp(actual_versionstr, collversionstr) != 0)
|
||||
ereport(WARNING,
|
||||
(errmsg("database \"%s\" has a collation version mismatch",
|
||||
|
|
|
@ -2838,7 +2838,7 @@ static struct config_int ConfigureNamesInt[] =
|
|||
{
|
||||
{"wal_decode_buffer_size", PGC_POSTMASTER, WAL_RECOVERY,
|
||||
gettext_noop("Maximum buffer size for reading ahead in the WAL during recovery."),
|
||||
gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetch referenced blocks."),
|
||||
gettext_noop("This controls the maximum distance we can read ahead in the WAL to prefetch data blocks referenced therein."),
|
||||
GUC_UNIT_BYTE
|
||||
},
|
||||
&wal_decode_buffer_size,
|
||||
|
|
|
@ -48,7 +48,7 @@ sub test_skip_lsn
|
|||
# Check the log to ensure that the transaction is skipped, and advance the
|
||||
# offset of the log file for the next test.
|
||||
$offset = $node_subscriber->wait_for_log(
|
||||
qr/LOG: ( [A-Z0-9]+:)? done skipping logical replication transaction finished at $lsn/,
|
||||
qr/LOG: ( [A-Z0-9]+:)? logical replication completed skipping transaction at LSN $lsn/,
|
||||
$offset);
|
||||
|
||||
# Insert non-conflict data
|
||||
|
|
Loading…
Reference in New Issue