Commita383c55

committed

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

the master is still in recovery. We don't support cascading slaves yet.Patch by Fujii Masao, with slightly changed wording.

1 parentbd11a0f commita383c55Copy full SHA for a383c55

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

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`

Comments

(0)