diff options
| author | Bruce Momjian <bruce@momjian.us> | 2018-08-14 17:19:02 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2018-08-14 17:19:02 -0400 |
| commit | 777e6ddf1723306bd2bf8fe6f804863f459b0323 (patch) | |
| tree | 0c2863b31bac78ad768c893f515183987b1da0f2 | |
| parent | 6f1591955db0a30f701ab10ea40cefeca6ff9b3f (diff) | |
| download | postgresql-777e6ddf1723306bd2bf8fe6f804863f459b0323.tar.gz postgresql-777e6ddf1723306bd2bf8fe6f804863f459b0323.zip | |
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
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index ce3f263b107..f2f3ac55e78 100644 --- 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"); |