Disable triggering failover with a signal in pg_standby on Windows, because

hlinnaka · hlinnaka · commit 48912acc089a · 2009-11-04T12:51:30.000Z
Windows doesn't do signal processing like other platforms do. It never
really worked, but recent changes to the signal handling made it crash.

This fixes bug #4961. Patch by Fujii Masao.
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.26 2009/06/25 19:33:25 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.27 2009/11/04 12:51:30 heikki Exp $
  *
  *
  * pg_standby.c
@@ -56,7 +56,9 @@ bool		debug = false;		/* are we debugging? */
 bool		need_cleanup = false;		/* do we need to remove files from
 										 * archive? */
 
+#ifndef WIN32
 static volatile sig_atomic_t signaled = false;
+#endif
 
 char	   *archiveLocation;	/* where to find the archive? */
 char	   *triggerPath;		/* where to find the trigger file? */
@@ -535,13 +537,13 @@ usage(void)
 	printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");
 }
 
+#ifndef WIN32
 static void
 sighandler(int sig)
 {
 	signaled = true;
 }
 
-#ifndef WIN32
 /* We don't want SIGQUIT to core dump */
 static void
 sigquit_handler(int sig)
@@ -573,6 +575,7 @@ main(int argc, char **argv)
 		}
 	}
 
+#ifndef WIN32
 	/*
 	 * You can send SIGUSR1 to trigger failover.
 	 *
@@ -584,10 +587,11 @@ main(int argc, char **argv)
 	 * out to be a bad idea because postmaster uses SIGQUIT to request
 	 * immediate shutdown. We still trap SIGINT, but that may change in a
 	 * future release.
+	 *
+	 * There's no way to trigger failover via signal on Windows.
 	 */
 	(void) signal(SIGUSR1, sighandler);
 	(void) signal(SIGINT, sighandler);	/* deprecated, use SIGUSR1 */
-#ifndef WIN32
 	(void) signal(SIGQUIT, sigquit_handler);
 #endif
 
@@ -763,6 +767,7 @@ main(int argc, char **argv)
 	{
 		/* Check for trigger file or signal first */
 		CheckForExternalTrigger();
+#ifndef WIN32
 		if (signaled)
 		{
 			Failover = FastFailover;
@@ -772,6 +777,7 @@ main(int argc, char **argv)
 				fflush(stderr);
 			}
 		}
+#endif
 
 		/*
 		 * Check for fast failover immediately, before checking if the

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.26 2009/06/25 19:33:25 tgl Exp $`
	`2`	`+ * $PostgreSQL: pgsql/contrib/pg_standby/pg_standby.c,v 1.27 2009/11/04 12:51:30 heikki Exp $`
`3`	`3`	`*`
`4`	`4`	`*`
`5`	`5`	`* pg_standby.c`
`@@ -56,7 +56,9 @@ bool debug = false; /* are we debugging? */`
`56`	`56`	`bool need_cleanup = false; /* do we need to remove files from`
`57`	`57`	`* archive? */`
`58`	`58`
	`59`	`+#ifndef WIN32`
`59`	`60`	`static volatile sig_atomic_t signaled = false;`
	`61`	`+#endif`
`60`	`62`
`61`	`63`	`char archiveLocation; / where to find the archive? */`
`62`	`64`	`char triggerPath; / where to find the trigger file? */`
`@@ -535,13 +537,13 @@ usage(void)`
`535`	`537`	`printf("\nReport bugs to <pgsql-bugs@postgresql.org>.\n");`
`536`	`538`	`}`
`537`	`539`
	`540`	`+#ifndef WIN32`
`538`	`541`	`static void`
`539`	`542`	`sighandler(int sig)`
`540`	`543`	`{`
`541`	`544`	`signaled = true;`
`542`	`545`	`}`
`543`	`546`
`544`		`-#ifndef WIN32`
`545`	`547`	`/* We don't want SIGQUIT to core dump */`
`546`	`548`	`static void`
`547`	`549`	`sigquit_handler(int sig)`
`@@ -573,6 +575,7 @@ main(int argc, char **argv)`
`573`	`575`	`}`
`574`	`576`	`}`
`575`	`577`
	`578`	`+#ifndef WIN32`
`576`	`579`	`/*`
`577`	`580`	`* You can send SIGUSR1 to trigger failover.`
`578`	`581`	`*`
`@@ -584,10 +587,11 @@ main(int argc, char **argv)`
`584`	`587`	`* out to be a bad idea because postmaster uses SIGQUIT to request`
`585`	`588`	`* immediate shutdown. We still trap SIGINT, but that may change in a`
`586`	`589`	`* future release.`
	`590`	`+ *`
	`591`	`+ * There's no way to trigger failover via signal on Windows.`
`587`	`592`	`*/`
`588`	`593`	`(void) signal(SIGUSR1, sighandler);`
`589`	`594`	`(void) signal(SIGINT, sighandler); /* deprecated, use SIGUSR1 */`
`590`		`-#ifndef WIN32`
`591`	`595`	`(void) signal(SIGQUIT, sigquit_handler);`
`592`	`596`	`#endif`
`593`	`597`
`@@ -763,6 +767,7 @@ main(int argc, char **argv)`
`763`	`767`	`{`
`764`	`768`	`/* Check for trigger file or signal first */`
`765`	`769`	`CheckForExternalTrigger();`
	`770`	`+#ifndef WIN32`
`766`	`771`	`if (signaled)`
`767`	`772`	`{`
`768`	`773`	`Failover = FastFailover;`
`@@ -772,6 +777,7 @@ main(int argc, char **argv)`
`772`	`777`	`fflush(stderr);`
`773`	`778`	`}`
`774`	`779`	`}`
	`780`	`+#endif`
`775`	`781`
`776`	`782`	`/*`
`777`	`783`	`* Check for fast failover immediately, before checking if the`