Commit9df822a

danielgustafsson

authored and

pull[bot]

committed

pg_upgrade: include additional detail in cluster check

When the cluster failed the pg_controldata check for clean shutdown we only reported that it did so, not why. The state of thecluster can be important information when diagnosing the failedupgrade attempt, so instead include it in the error message.Discussion:https://postgr.es/m/E0D5EA16-A085-4753-8DDC-C7055048B439@yesql.se

1 parentabed447 commit9df822aCopy full SHA for 9df822a

File tree

1 file changed

-5

lines changed

src/bin/pg_upgrade
- controldata.c

1 file changed

-5

lines changed

`‎src/bin/pg_upgrade/controldata.c`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,22 +149,23 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`149`	`149`	`* the server was shut down cleanly, from the controldata`
`150`	`150`	`* perspective.`
`151`	`151`	`*/`
`152`		`-/* remove leading spaces */`
	`152`	`+/* Remove trailing newline and leading spaces */`
	`153`	`+(void)pg_strip_crlf(p);`
`153`	`154`	`while (*p==' ')`
`154`	`155`	`p++;`
`155`		`-if (strcmp(p,"shut down in recovery\n")==0)`
	`156`	`+if (strcmp(p,"shut down in recovery")==0)`
`156`	`157`	`{`
`157`	`158`	`if (cluster==&old_cluster)`
`158`	`159`	`pg_fatal("The source cluster was shut down while in recovery mode. To upgrade, use \"rsync\" as documented or shut it down as a primary.");`
`159`	`160`	`else`
`160`	`161`	`pg_fatal("The target cluster was shut down while in recovery mode. To upgrade, use \"rsync\" as documented or shut it down as a primary.");`
`161`	`162`	`}`
`162`		`-elseif (strcmp(p,"shut down\n")!=0)`
	`163`	`+elseif (strcmp(p,"shut down")!=0)`
`163`	`164`	`{`
`164`	`165`	`if (cluster==&old_cluster)`
`165`		`-pg_fatal("The source cluster was not shut down cleanly.");`
	`166`	`+pg_fatal("The source cluster was not shut down cleanly, state reported as: \"%s\"",p);`
`166`	`167`	`else`
`167`		`-pg_fatal("The target cluster was not shut down cleanly.");`
	`168`	`+pg_fatal("The target cluster was not shut down cleanly, state reported as: \"%s\"",p);`
`168`	`169`	`}`
`169`	`170`	`got_cluster_state= true;`
`170`	`171`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9df822a

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/controldata.c`

0 commit comments