pg_upgrade: issue helpful error message for use on standbys

bmomjian · bmomjian · commit a49cf6ef3d0c · 2018-08-17T10:25:48.000-04:00
Commit 777e6dd checked for a shut down message from a standby and allowed it to continue. This patch reports a helpful error message in these cases, suggesting to use rsync as documented. Diagnosed-by: Martín Marqués Discussion: https://postgr.es/m/CAPdiE1xYCow-reLjrhJ9DqrMu-ppNq0ChUUEvVdxhdjGRD5_eA@mail.gmail.com Backpatch-through: 9.3
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
@@ -148,8 +148,14 @@ get_control_data(ClusterInfo *cluster, bool live_check)
 				/* remove leading spaces */
 				while (*p == ' ')
 					p++;
-				if (strcmp(p, "shut down\n") != 0 &&
-					strcmp(p, "shut down in recovery\n") != 0)
+				if (strcmp(p, "shut down in recovery\n") == 0)
+				{
+					if (cluster == &old_cluster)
+						pg_log(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");
+					else
+						pg_log(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");
+				}
+				else if (strcmp(p, "shut down\n") != 0)
 				{
 					if (cluster == &old_cluster)
 						pg_log(PG_FATAL, "The source cluster was not shut down cleanly.\n");
