summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2017-01-13 12:00:00 -0500
committerPeter Eisentraut <peter_e@gmx.net>2017-01-13 16:20:00 -0500
commit7fbd3ddd1d2b76c0229cdc44d355b6238c146335 (patch)
tree300671c2a7bdf76b7c6c580a76f52f59bd45bfaa
parent26e7cdb3a80d340742aeb5bfe2dbc42edfb9d34b (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 14373894121..5e7cc6171cc 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -319,7 +319,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;
}