Commit 7f5b043d authored by Peter Eisentraut's avatar Peter Eisentraut

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.
parent 0563a3a8
...@@ -320,7 +320,7 @@ stop_postmaster(bool fast) ...@@ -320,7 +320,7 @@ stop_postmaster(bool fast)
"\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop", "\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop",
cluster->bindir, cluster->pgconfig, cluster->bindir, cluster->pgconfig,
cluster->pgopts ? cluster->pgopts : "", cluster->pgopts ? cluster->pgopts : "",
fast ? "-m fast" : ""); fast ? "-m fast" : "-m smart");
os_info.running_cluster = NULL; os_info.running_cluster = NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment