From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 6 Jun 2007 11:56:54 +0000 (+1000)
Subject: get parents idea of recmode and recmaster when deciding if we should do a takeover run
X-Git-Tag: tevent-0.9.20~348^2~2546
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fbca613d405e3fe70ad31cf118d7bdddb03000e;p=thirdparty%2Fsamba.git

get parents idea of recmode and recmaster when deciding if we should do a takeover run
(This used to be ctdb commit 0e8124acd2f1a9b34292c1ee13c7e4cd6fe49876)
---

diff --git a/ctdb/common/ctdb_recoverd.c b/ctdb/common/ctdb_recoverd.c
index cdbeab377c4..8a376d66f36 100644
--- a/ctdb/common/ctdb_recoverd.c
+++ b/ctdb/common/ctdb_recoverd.c
@@ -996,8 +996,17 @@ static void monitor_handler(struct ctdb_context *ctdb, uint64_t srvid,
 	}
 
 	nodemap->nodes[i].flags = c->flags;
+
+	ret = ctdb_ctrl_getrecmaster(ctdb, CONTROL_TIMEOUT(), 
+				     CTDB_CURRENT_NODE, &ctdb->recovery_master);
+
+	if (ret == 0) {
+		ret = ctdb_ctrl_getrecmode(ctdb, CONTROL_TIMEOUT(), 
+					   CTDB_CURRENT_NODE, &ctdb->recovery_mode);
+	}
 	
-	if (ctdb->recovery_master == ctdb->vnn &&
+	if (ret == 0 &&
+	    ctdb->recovery_master == ctdb->vnn &&
 	    ctdb->recovery_mode == CTDB_RECOVERY_NORMAL &&
 	    ctdb->takeover.enabled) {
 		ret = ctdb_takeover_run(ctdb, nodemap);