git.postgresql.org Git - postgresql.git/commitdiff

2010年3月16日 09:09:55 +0000 (09:09 +0000)

2010年3月16日 09:09:55 +0000 (09:09 +0000)

the master is still in recovery. We don't support cascading slaves yet.

Patch by Fujii Masao, with slightly changed wording.

index 2a2765645e4803a91e73a6db2a28cd0ac6af9419..0a648e72e1792fbb70c7c204c7a4b8265ed3c395 100644 (file)

* 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();

This is the main PostgreSQL git repository.