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 d6c08666a6c28fc22403f3745dc48853daf1eeaa..be6e8f93d2d1f1242975f4b065337fc0753f2231 100644 (file)
--- 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;
                }
        }