recoverd: Banned nodes should not be told to run "ipreallocated" event
authorMartin Schwenke <martin@meltin.net>
Fri, 2 Aug 2013 06:29:32 +0000 (16:29 +1000)
committerAmitay Isaacs <amitay@gmail.com>
Wed, 14 Aug 2013 06:15:13 +0000 (16:15 +1000)
They will reject it because they are in recovery.  This can result in
extra banning credits being applied to banned nodes.

Signed-off-by: Martin Schwenke <martin@meltin.net>
server/ctdb_takeover.c

index ab1cb2c78986b2904c8f9672daf997008590ad38..9fdf2278591f4c61134258afe8756249c796005c 100644 (file)
@@ -2186,8 +2186,7 @@ ipreallocated:
         */
        data.dptr  = discard_const("ipreallocated");
        data.dsize = strlen((char *)data.dptr) + 1; 
-       nodes = list_of_nodes(ctdb, nodemap, tmp_ctx,
-                             NODE_FLAGS_DISCONNECTED|NODE_FLAGS_STOPPED, -1);
+       nodes = list_of_nodes(ctdb, nodemap, tmp_ctx, NODE_FLAGS_INACTIVE, -1);
        if (ctdb_client_async_control(ctdb, CTDB_CONTROL_RUN_EVENTSCRIPTS,
                                      nodes, 0, TAKEOVER_TIMEOUT(),
                                      false, data,