Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5e58107

Browse files
committed
pg_upgrade: Message style improvements
1 parent74e3db0 commit5e58107

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

‎src/bin/pg_upgrade/check.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ check_for_data_types_usage(ClusterInfo *cluster, DataTypesUsageChecks *checks)
342342
DataTypesUsageChecks*tmp=checks;
343343
intn_data_types_usage_checks=0;
344344

345-
prep_status("Checkingfordata type usage");
345+
prep_status("Checking data type usage");
346346

347347
/* Gather number of checks to perform */
348348
while (tmp->status!=NULL)
@@ -1756,7 +1756,7 @@ check_new_cluster_logical_replication_slots(void)
17561756
nslots_on_new=atoi(PQgetvalue(res,0,0));
17571757

17581758
if (nslots_on_new)
1759-
pg_fatal("Expected 0 logical replication slots but found %d.",
1759+
pg_fatal("expected 0 logical replication slots but found %d",
17601760
nslots_on_new);
17611761

17621762
PQclear(res);
@@ -1771,7 +1771,7 @@ check_new_cluster_logical_replication_slots(void)
17711771
wal_level=PQgetvalue(res,0,0);
17721772

17731773
if (strcmp(wal_level,"logical")!=0)
1774-
pg_fatal("\"wal_level\" must be \"logical\", but is set to \"%s\"",
1774+
pg_fatal("\"wal_level\" must be \"logical\" but is set to \"%s\"",
17751775
wal_level);
17761776

17771777
max_replication_slots=atoi(PQgetvalue(res,1,0));
@@ -1895,7 +1895,7 @@ check_old_cluster_for_valid_slots(bool live_check)
18951895
fclose(script);
18961896

18971897
pg_log(PG_REPORT,"fatal");
1898-
pg_fatal("Your installation contains logical replication slots thatcan't be upgraded.\n"
1898+
pg_fatal("Your installation contains logical replication slots thatcannot be upgraded.\n"
18991899
"You can remove invalid slots and/or consume the pending WAL for other slots,\n"
19001900
"and then restart the upgrade.\n"
19011901
"A list of the problematic slots is in the file:\n"

‎src/bin/pg_upgrade/info.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,13 +829,13 @@ print_slot_infos(LogicalSlotInfoArr *slot_arr)
829829
if (slot_arr->nslots==0)
830830
return;
831831

832-
pg_log(PG_VERBOSE,"Logical replication slotswithin the database:");
832+
pg_log(PG_VERBOSE,"Logical replication slotsin the database:");
833833

834834
for (intslotnum=0;slotnum<slot_arr->nslots;slotnum++)
835835
{
836836
LogicalSlotInfo*slot_info=&slot_arr->slots[slotnum];
837837

838-
pg_log(PG_VERBOSE,"slot_name: \"%s\", plugin: \"%s\", two_phase: %s",
838+
pg_log(PG_VERBOSE,"slot name: \"%s\", output plugin: \"%s\", two_phase: %s",
839839
slot_info->slotname,
840840
slot_info->plugin,
841841
slot_info->two_phase ?"true" :"false");

‎src/bin/pg_upgrade/t/003_logical_slots.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
[@pg_upgrade_cmd],
118118
1,
119119
[
120-
qr/Your installation contains logical replication slots thatcan't be upgraded./
120+
qr/Your installation contains logical replication slots thatcannot be upgraded./
121121
],
122122
[qr//],
123123
'run of pg_upgrade of old cluster with slots having unconsumed WAL records'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp