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 ce3f263b107ce8261e5040afa119c891b64ec5cb..f2f3ac55e78e1c6a8f835c9179bd2440435baa41 100644 (file)
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -150,7 +150,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");