From f7acc0397c60ed13137d7392e4210eb0f9d5877e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 13 Jan 2017 12:00:00 -0500 Subject: [PATCH] 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. --- src/bin/pg_upgrade/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 830335f501..dd46e9f881 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; }