diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2024-08-26 14:38:59 +0200 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2024-08-26 14:38:59 +0200 |
| commit | 5e58107b0bb5a10b36ba4af4a9f82e6254d75e9f (patch) | |
| tree | b371ad9aa8abde44f6a6849fa69543d9b4267d3d /src | |
| parent | 74e3db06a01d1fe6b9f30f71e05e8438d3aaa37b (diff) | |
| download | postgresql-5e58107b0bb5a10b36ba4af4a9f82e6254d75e9f.tar.gz postgresql-5e58107b0bb5a10b36ba4af4a9f82e6254d75e9f.zip | |
pg_upgrade: Message style improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/check.c | 8 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/info.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/t/003_logical_slots.pl | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c index 51e30a2f239..37d2394c11f 100644 --- a/src/bin/pg_upgrade/check.c +++ b/src/bin/pg_upgrade/check.c @@ -342,7 +342,7 @@ check_for_data_types_usage(ClusterInfo *cluster, DataTypesUsageChecks *checks) DataTypesUsageChecks *tmp = checks; int n_data_types_usage_checks = 0; - prep_status("Checking for data type usage"); + prep_status("Checking data type usage"); /* Gather number of checks to perform */ while (tmp->status != NULL) @@ -1756,7 +1756,7 @@ check_new_cluster_logical_replication_slots(void) nslots_on_new = atoi(PQgetvalue(res, 0, 0)); if (nslots_on_new) - pg_fatal("Expected 0 logical replication slots but found %d.", + pg_fatal("expected 0 logical replication slots but found %d", nslots_on_new); PQclear(res); @@ -1771,7 +1771,7 @@ check_new_cluster_logical_replication_slots(void) wal_level = PQgetvalue(res, 0, 0); if (strcmp(wal_level, "logical") != 0) - pg_fatal("\"wal_level\" must be \"logical\", but is set to \"%s\"", + pg_fatal("\"wal_level\" must be \"logical\" but is set to \"%s\"", wal_level); max_replication_slots = atoi(PQgetvalue(res, 1, 0)); @@ -1895,7 +1895,7 @@ check_old_cluster_for_valid_slots(bool live_check) fclose(script); pg_log(PG_REPORT, "fatal"); - pg_fatal("Your installation contains logical replication slots that can't be upgraded.\n" + pg_fatal("Your installation contains logical replication slots that cannot be upgraded.\n" "You can remove invalid slots and/or consume the pending WAL for other slots,\n" "and then restart the upgrade.\n" "A list of the problematic slots is in the file:\n" diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c index c07a69b63e5..5c041fa06e0 100644 --- a/src/bin/pg_upgrade/info.c +++ b/src/bin/pg_upgrade/info.c @@ -829,13 +829,13 @@ print_slot_infos(LogicalSlotInfoArr *slot_arr) if (slot_arr->nslots == 0) return; - pg_log(PG_VERBOSE, "Logical replication slots within the database:"); + pg_log(PG_VERBOSE, "Logical replication slots in the database:"); for (int slotnum = 0; slotnum < slot_arr->nslots; slotnum++) { LogicalSlotInfo *slot_info = &slot_arr->slots[slotnum]; - pg_log(PG_VERBOSE, "slot_name: \"%s\", plugin: \"%s\", two_phase: %s", + pg_log(PG_VERBOSE, "slot name: \"%s\", output plugin: \"%s\", two_phase: %s", slot_info->slotname, slot_info->plugin, slot_info->two_phase ? "true" : "false"); diff --git a/src/bin/pg_upgrade/t/003_logical_slots.pl b/src/bin/pg_upgrade/t/003_logical_slots.pl index 87c471a6ead..0a2483d3dfc 100644 --- a/src/bin/pg_upgrade/t/003_logical_slots.pl +++ b/src/bin/pg_upgrade/t/003_logical_slots.pl @@ -117,7 +117,7 @@ command_checks_all( [@pg_upgrade_cmd], 1, [ - qr/Your installation contains logical replication slots that can't be upgraded./ + qr/Your installation contains logical replication slots that cannot be upgraded./ ], [qr//], 'run of pg_upgrade of old cluster with slots having unconsumed WAL records' |