use our own netmask when deciding if we should takeover a IP, not the other nodes

- check if ctdb dies while waiting for the startup event

(This used to be ctdb commit 8b59f73c527a6d0a8abe8030dc3cbbc4329657be)

diff --git a/ctdb/takeover/ctdb_takeover.c b/ctdb/takeover/ctdb_takeover.c
index 5e4368c80c025c5f2f185964affcd259191e94a0..94ac1a4c737acfbcb458c3b33a9c2e9e55c40281 100644 (file)
--- a/ctdb/takeover/ctdb_takeover.c
+++ b/ctdb/takeover/ctdb_takeover.c
@@ -318,8 +318,9 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap)
                             j != i;
                             j=(j+1)%nodemap->num) {
                                if ((nodemap->nodes[j].flags & NODE_FLAGS_CONNECTED) &&
-                                   ctdb_same_subnet(ctdb->nodes[j]->public_address, ctdb->nodes[i]->public_address, 
-                                                    ctdb->nodes[i]->public_netmask_bits)) {
+                                   ctdb_same_subnet(ctdb->nodes[j]->public_address, 
+                                                    ctdb->nodes[i]->public_address, 
+                                                    ctdb->nodes[j]->public_netmask_bits)) {
                                        ctdb->nodes[i]->takeover_vnn = nodemap->nodes[j].vnn;
                                        break;
                                }

diff --git a/ctdb/tools/events b/ctdb/tools/events
index 22b0742971859d46a8f80b01d25bf0a47ba7a30d..18d6fc9b2f3221433ba5de99a6d1831ede678a1c 100755 (executable)
--- a/ctdb/tools/events
+++ b/ctdb/tools/events
@@ -18,6 +18,10 @@ case $cmd in
                      /usr/bin/nc -z 127.0.0.1 $p || all_ok=0
                  done
                  [ $all_ok -eq 1 ] || sleep 1
+                 /usr/bin/ctdb status > /dev/null 2>&1 || {
+                       echo "ctdb daemon has died. Exiting event startup"
+                       exit 1
+                 }
           done
          echo "Local tcp services on $CTDB_WAIT_TCP_PORTS are up"
        }