Register atexit hook only once in pg_upgrade.

tglsfdc · tglsfdc · commit 737f25cfedf0 · 2016-07-28T11:39:11.000-04:00
start_postmaster() registered stop_postmaster_atexit as an atexit(3)
callback each time through, although the obvious intention was to do
so only once per program run.  The extra registrations were harmless,
so long as we didn't exceed ATEXIT_MAX, but still it's a bug.

Artur Zakirov, with bikeshedding by Kyotaro Horiguchi and me

Discussion: &lt;d279e817-02b5-caa6-215f-cfb05dce109a@postgrespro.ru&gt;
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
@@ -175,10 +175,11 @@ start_postmaster(ClusterInfo *cluster)
 {
 	char		cmd[MAXPGPATH * 4 + 1000];
 	PGconn	   *conn;
-	bool		exit_hook_registered = false;
 	bool		pg_ctl_return = false;
 	char		socket_string[MAXPGPATH + 200];
 
+	static bool exit_hook_registered = false;
+
 	if (!exit_hook_registered)
 	{
 		atexit(stop_postmaster_atexit);

Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,11 @@ start_postmaster(ClusterInfo *cluster)`
`175`	`175`	`{`
`176`	`176`	`char cmd[MAXPGPATH * 4 + 1000];`
`177`	`177`	`PGconn *conn;`
`178`		`- bool exit_hook_registered = false;`
`179`	`178`	`bool pg_ctl_return = false;`
`180`	`179`	`char socket_string[MAXPGPATH + 200];`
`181`	`180`
	`181`	`+ static bool exit_hook_registered = false;`
	`182`	`+`
`182`	`183`	`if (!exit_hook_registered)`
`183`	`184`	`{`
`184`	`185`	`atexit(stop_postmaster_atexit);`