Revert "From Wolfgang Mueller,"

This reverts commit b74ba9a75db431a59b0e68a4b57c48d8c28221d5.

diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index c2591a7b7a5ddb4205844586597bc2450a875b25..b666a9ed1bc80d58d4467578e9bab457743c29f6 100644 (file)
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -343,13 +343,7 @@ 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) {
-                       /*
-                        * we used to exit here with a ctdb_fatal(ctdb, "ctdb_req_dmaster from non-master");
-                        * as long as we haven't found a protocol problem we just initiate recovery
-                        */
-                       DEBUG(DEBUG_ALERT,(__location__"real-dmaster problem triggering recovery\n"));
-                       ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE;
-                       ctdb_ltdb_unlock(ctdb_db, key);
+                       ctdb_fatal(ctdb, "ctdb_req_dmaster from non-master");
                        return;
                }
        }