database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

pg_upgrade: Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut 2024-08-26 14:38:59 +02:00
parent 7cac6307a4
commit dbe37f1adb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/pg_upgrade/check.c
View File

@ -342,7 +342,7 @@ check_for_data_types_usage(ClusterInfo *cluster, DataTypesUsageChecks *checks)
DataTypesUsageChecks *tmp = checks; DataTypesUsageChecks *tmp = checks;
int n_data_types_usage_checks = 0; 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 */ /* Gather number of checks to perform */
while (tmp->status != NULL) while (tmp->status != NULL)
@ -1756,7 +1756,7 @@ check_new_cluster_logical_replication_slots(void)
nslots_on_new = atoi(PQgetvalue(res, 0, 0)); nslots_on_new = atoi(PQgetvalue(res, 0, 0));
if (nslots_on_new) 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); nslots_on_new);
PQclear(res); PQclear(res);
@ -1771,7 +1771,7 @@ check_new_cluster_logical_replication_slots(void)
wal_level = PQgetvalue(res, 0, 0); wal_level = PQgetvalue(res, 0, 0);
if (strcmp(wal_level, "logical") != 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); wal_level);
max_replication_slots = atoi(PQgetvalue(res, 1, 0)); max_replication_slots = atoi(PQgetvalue(res, 1, 0));
@ -1895,7 +1895,7 @@ check_old_cluster_for_valid_slots(void)
fclose(script); fclose(script);
pg_log(PG_REPORT, "fatal"); 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" "You can remove invalid slots and/or consume the pending WAL for other slots,\n"
"and then restart the upgrade.\n" "and then restart the upgrade.\n"
"A list of the problematic slots is in the file:\n" "A list of the problematic slots is in the file:\n"

4
src/bin/pg_upgrade/info.c
View File

@ -827,13 +827,13 @@ print_slot_infos(LogicalSlotInfoArr *slot_arr)
if (slot_arr->nslots == 0) if (slot_arr->nslots == 0)
return; 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++) for (int slotnum = 0; slotnum < slot_arr->nslots; slotnum++)
{ {
LogicalSlotInfo *slot_info = &slot_arr->slots[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->slotname,
slot_info->plugin, slot_info->plugin,
slot_info->two_phase ? "true" : "false"); slot_info->two_phase ? "true" : "false");

2
src/bin/pg_upgrade/t/003_logical_slots.pl
View File

@ -117,7 +117,7 @@ command_checks_all(
[@pg_upgrade_cmd], [@pg_upgrade_cmd],
1, 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//], [qr//],
'run of pg_upgrade of old cluster with slots having unconsumed WAL records' 'run of pg_upgrade of old cluster with slots having unconsumed WAL records'