Throw a nicer error message if a standby server attempts to connect while

hlinnaka · hlinnaka · commit a383c55a1d8b · 2010-03-16T09:09:55.000Z
the master is still in recovery. We don't support cascading slaves yet.

Patch by Fujii Masao, with slightly changed wording.
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -30,7 +30,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.9 2010/02/26 02:00:58 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.10 2010/03/16 09:09:55 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -119,6 +119,11 @@ WalSenderMain(void)
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
 				 errmsg("must be superuser to start walsender")));
 
+	if (RecoveryInProgress())
+		ereport(FATAL,
+				(errcode(ERRCODE_CANNOT_CONNECT_NOW),
+				 errmsg("recovery is still in progress, can't accept WAL streaming connections")));
+
 	/* Create a per-walsender data structure in shared memory */
 	InitWalSnd();
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`*`
`31`	`31`	`*`
`32`	`32`	`* IDENTIFICATION`
`33`		`- * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.9 2010/02/26 02:00:58 momjian Exp $`
	`33`	`+ * $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.10 2010/03/16 09:09:55 heikki Exp $`
`34`	`34`	`*`
`35`	`35`	`*-------------------------------------------------------------------------`
`36`	`36`	`*/`
`@@ -119,6 +119,11 @@ WalSenderMain(void)`
`119`	`119`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`120`	`120`	`errmsg("must be superuser to start walsender")));`
`121`	`121`
	`122`	`+ if (RecoveryInProgress())`
	`123`	`+ ereport(FATAL,`
	`124`	`+ (errcode(ERRCODE_CANNOT_CONNECT_NOW),`
	`125`	`+ errmsg("recovery is still in progress, can't accept WAL streaming connections")));`
	`126`	`+`
`122`	`127`	`/* Create a per-walsender data structure in shared memory */`
`123`	`128`	`InitWalSnd();`
`124`	`129`