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.

diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index bc2704eeef18a20c896df0ab6254561618939c9c..87a98983e220db01662e2ac876fe41fa6366a93f 100644 (file)
--- 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;
 }