summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut2017-01-13 17:00:00 +0000
committerPeter Eisentraut2017-01-13 21:07:18 +0000
commit7f5b043d69a83e44e22a6b42f902e3e268b80a24 (patch)
treeb492482a42da95f8b1e8bbb3d0c37d8600907ae4
parent0563a3a8b59150bf3cc8b2b7077f684e0eaf8aff (diff)
pg_upgrade: Fix for changed pg_ctl default stop mode
In 9.5, the default pg_ctl stop mode was changed from "smart" to "fast". pg_upgrade still thought the default mode was "smart" and only specified the mode when "fast" was asked for. This results in using "fast" all the time. It's not clear what the effect in practice is, but fix it nonetheless to restore the previous behavior.
-rw-r--r--src/bin/pg_upgrade/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index bc2704eeef..87a98983e2 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -320,7 +320,7 @@ stop_postmaster(bool fast)
"\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop",
cluster->bindir, cluster->pgconfig,
cluster->pgopts ? cluster->pgopts : "",
- fast ? "-m fast" : "");
+ fast ? "-m fast" : "-m smart");
os_info.running_cluster = NULL;
}