banning: Make ctdb_local_node_got_banned() a void function

When this function is called, we are already committed to banning
and there is no point in failing this function.  In case, freezing of
databases fails, it will be fixed from recovery daemon.

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 365eb3ecddeecb8bc001eef2ac7bf536e9f62c3b..05109acb6d24f4a0f6d7a323c666b70acffcfa20 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1440,7 +1440,7 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db);
 int32_t ctdb_control_enable_script(struct ctdb_context *ctdb, TDB_DATA indata);
 int32_t ctdb_control_disable_script(struct ctdb_context *ctdb, TDB_DATA indata);
 
-int32_t ctdb_local_node_got_banned(struct ctdb_context *ctdb);
+void ctdb_local_node_got_banned(struct ctdb_context *ctdb);
 int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata);
 int32_t ctdb_control_get_ban_state(struct ctdb_context *ctdb, TDB_DATA *outdata);
 int32_t ctdb_control_set_db_priority(struct ctdb_context *ctdb, TDB_DATA indata);

diff --git a/server/ctdb_banning.c b/server/ctdb_banning.c
index 0d1729dbe4791cf15e660b47b48c477ba06637c0..67927a23d52cb6c5099fe5bdba7b0c4cfcb44da4 100644 (file)
--- a/server/ctdb_banning.c
+++ b/server/ctdb_banning.c
@@ -41,7 +41,7 @@ ctdb_ban_node_event(struct event_context *ev, struct timed_event *te,
        }
 }
 
-int32_t ctdb_local_node_got_banned(struct ctdb_context *ctdb)
+void ctdb_local_node_got_banned(struct ctdb_context *ctdb)
 {
        uint32_t i;
 
@@ -60,8 +60,6 @@ int32_t ctdb_local_node_got_banned(struct ctdb_context *ctdb)
        }
        ctdb_release_all_ips(ctdb);
        ctdb->recovery_mode = CTDB_RECOVERY_ACTIVE;
-
-       return 0;
 }
 
 int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
@@ -123,7 +121,7 @@ int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata)
 
        event_add_timed(ctdb->ev, ctdb->banning_ctx, timeval_current_ofs(bantime->time,0), ctdb_ban_node_event, ctdb);
        if (bantime->pnn == ctdb->pnn) {
-               return ctdb_local_node_got_banned(ctdb);
+               ctdb_local_node_got_banned(ctdb);
        }
 
        return 0;

diff --git a/server/ctdb_monitor.c b/server/ctdb_monitor.c
index 106a44f7d27b5b072e767d128b31756f18b08426..8d28fff14f0f427fef24b3f18959eb85630ee2fb 100644 (file)
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -491,7 +491,7 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata)
 
        /* if we have become banned, we should go into recovery mode */
        if ((node->flags & NODE_FLAGS_BANNED) && !(c->old_flags & NODE_FLAGS_BANNED) && (node->pnn == ctdb->pnn)) {
-               return ctdb_local_node_got_banned(ctdb);
+               ctdb_local_node_got_banned(ctdb);
        }
        
        return 0;