Avoid starting walreceiver in states where it shouldn't be running.

robertmhaas · robertmhaas · commit 5e85315ea7a4 · 2010-05-27T02:01:37.000Z
In particular, it's bad to start walreceiver when in state
PM_WAIT_BACKENDS, because we have no provision to kill walreceiver
when in that state.

Fujii Masao
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.609 2010/05/26 12:32:41 rhaas Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.610 2010/05/27 02:01:37 rhaas Exp $
  *
  * NOTES
  *
@@ -4217,7 +4217,9 @@ sigusr1_handler(SIGNAL_ARGS)
 	}
 
 	if (CheckPostmasterSignal(PMSIGNAL_START_WALRECEIVER) &&
-		WalReceiverPID == 0)
+		WalReceiverPID == 0 &&
+		(pmState == PM_STARTUP || pmState == PM_RECOVERY ||
+		 pmState == PM_HOT_STANDBY || pmState == PM_WAIT_READONLY))
 	{
 		/* Startup Process wants us to start the walreceiver process. */
 		WalReceiverPID = StartWalReceiver();

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.609 2010/05/26 12:32:41 rhaas Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.610 2010/05/27 02:01:37 rhaas Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -4217,7 +4217,9 @@ sigusr1_handler(SIGNAL_ARGS)`
`4217`	`4217`	`}`
`4218`	`4218`
`4219`	`4219`	`if (CheckPostmasterSignal(PMSIGNAL_START_WALRECEIVER) &&`
`4220`		`- WalReceiverPID == 0)`
	`4220`	`+ WalReceiverPID == 0 &&`
	`4221`	`+ (pmState == PM_STARTUP \|\| pmState == PM_RECOVERY \|\|`
	`4222`	`+ pmState == PM_HOT_STANDBY \|\| pmState == PM_WAIT_READONLY))`
`4221`	`4223`	`{`
`4222`	`4224`	`/* Startup Process wants us to start the walreceiver process. */`
`4223`	`4225`	`WalReceiverPID = StartWalReceiver();`