Commit87be73e

committed

pg_upgrade: issue helpful error message for use on standbys

Commit777e6dd checked for a shut downmessage from a standby and allowed it to continue. This patch reports ahelpful error message in these cases, suggesting to use rsync asdocumented.Diagnosed-by: Martín MarquésDiscussion:https://postgr.es/m/CAPdiE1xYCow-reLjrhJ9DqrMu-ppNq0ChUUEvVdxhdjGRD5_eA@mail.gmail.comBackpatch-through: 9.3

1 parent86e873c commit87be73eCopy full SHA for 87be73e

File tree

-2

lines changed

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,14 @@ get_control_data(ClusterInfo *cluster, bool live_check)`
`149`	`149`	`/* remove leading spaces */`
`150`	`150`	`while (*p==' ')`
`151`	`151`	`p++;`
`152`		`-if (strcmp(p,"shut down\n")!=0&&`
`153`		`-strcmp(p,"shut down in recovery\n")!=0)`
	`152`	`+if (strcmp(p,"shut down in recovery\n")==0)`
	`153`	`+{`
	`154`	`+if (cluster==&old_cluster)`
	`155`	`+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.\n");`
	`156`	`+else`
	`157`	`+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.\n");`
	`158`	`+}`
	`159`	`+elseif (strcmp(p,"shut down\n")!=0)`
`154`	`160`	`{`
`155`	`161`	`if (cluster==&old_cluster)`
`156`	`162`	`pg_fatal("The source cluster was not shut down cleanly.\n");`

Comments

(0)