diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/replication/logical/worker.c | 6 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 7 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 2 | ||||
| -rw-r--r-- | src/test/subscription/t/029_on_error.pl | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index 38e3b1c1b3c..482ecb4d246 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -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))); } diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 29f70accb22..28d5e19848a 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -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", diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 21b10f1fc9e..97f0fb397c6 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -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, diff --git a/src/test/subscription/t/029_on_error.pl b/src/test/subscription/t/029_on_error.pl index 05daa77c58a..add8788370c 100644 --- a/src/test/subscription/t/029_on_error.pl +++ b/src/test/subscription/t/029_on_error.pl @@ -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 |