pg_upgrade: fix shutdown check for standby servers

Commit 244142d32afd02e7408a2ef1f249b00393983822 only tested for the
pg_controldata output for primary servers, but standby servers have
different "Database cluster state" output, so check for that too.

Diagnosed-by: Michael Paquier
Discussion: https://postgr.es/m/20180810164240.GM13638@paquier.xyz

Backpatch-through: 9.3

diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index 799a56288d48d07646422959b73c6c62749852e1..6d1a3dfd570c3db656445ee83eb799fb7c355b3a 100644 (file)
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -149,7 +149,8 @@ get_control_data(ClusterInfo *cluster, bool live_check)
                                /* remove leading spaces */
                                while (*p == ' ')
                                        p++;
-                               if (strcmp(p, "shut down\n") != 0)
+                               if (strcmp(p, "shut down\n") != 0 &&
+                                       strcmp(p, "shut down in recovery\n") != 0)
                                {
                                        if (cluster == &old_cluster)
                                                pg_fatal("The source cluster was not shut down cleanly.\n");