pg_upgrade: Fix for changed pg_ctl default stop mode

petere · petere · commit f7acc0397c60 · 2017-01-13T16:19:48.000-05:00
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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ stop_postmaster(bool fast)`
`320`	`320`	`"\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop",`
`321`	`321`	`cluster->bindir, cluster->pgconfig,`
`322`	`322`	`cluster->pgopts ? cluster->pgopts : "",`
`323`		`- fast ? "-m fast" : "");`
	`323`	`+ fast ? "-m fast" : "-m smart");`
`324`	`324`
`325`	`325`	`os_info.running_cluster = NULL;`
`326`	`326`	`}`