From: Ronnie Sahlberg <sahlberg@lenovo-laptop.(none)>
Date: Mon, 21 Feb 2011 05:19:18 +0000 (+1100)
Subject: Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=40cc810b184970d1ef20ad5078f30132db233cee;hp=771e31fbfafed5986aba01c1392385dc4086eccd;p=sahlberg%2Fctdb.git

Merge branch '1.3' of 10.1.1.27:/shared/ctdb/ctdb-git into 1.3
---

diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index d6c08666..be6e8f93 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -369,7 +369,9 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
 			 (unsigned long long)c->rsn, (unsigned long long)header.rsn, c->hdr.reqid,
 			 (key.dsize >= 4)?(*(uint32_t *)key.dptr):0));
 		if (header.rsn != 0 || header.dmaster != ctdb->pnn) {
-			ctdb_fatal(ctdb, "ctdb_req_dmaster from non-master");
+			DEBUG(DEBUG_ERR,("ctdb_req_dmaster from non-master. Force a recovery.\n"));
+
+			ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE;
 			return;
 		}
 	}