ctdb/recoverd: Do not refuse disabling takeover runs on inactive nodes
authorMartin Schwenke <martin@meltin.net>
Wed, 18 Dec 2013 08:15:39 +0000 (19:15 +1100)
committerAmitay Isaacs <amitay@gmail.com>
Fri, 17 Jan 2014 06:59:19 +0000 (17:59 +1100)
Failure might be expected when disabling takeover runs on banned
nodes, since they might be suffering from performance problems or
similar.  More broadly, administrators who reconfigure a cluster that
isn't in a happy state aren't necessarily doing something sensible.

However, allowing takeover runs to be disabled on inactive nodes stops
reconfiguration of stopped nodes.  This is probaby an unreasonable
limitation, so drop it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_recoverd.c

index c5cd36cfa9230558671b81c4c5997a9a9c200d1a..179eb7d311baf1cc47a109d7015e5a4c223fd021 100644 (file)
@@ -2498,13 +2498,6 @@ static void disable_takeover_runs_handler(struct ctdb_context *ctdb,
                goto done;
        }
 
-       if (rec->node_flags & NODE_FLAGS_INACTIVE) {
-               DEBUG(DEBUG_ERR,
-                     ("Refusing to disable takeover runs on inactive node\n"));
-               ret = -EHOSTDOWN;
-               goto done;
-       }
-
        if (rec->takeover_run_in_progress) {
                DEBUG(DEBUG_ERR,
                      ("Unable to disable takeover runs - in progress\n"));