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.
(cherry picked from commit bb178338658b4ae32382a1f62f7c21cee1d4878f)

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 85b6f3193cc00b56cfdaa92215981cfb1876500a..87e9a60c3f81477a137971d7e4af0bb91107d417 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -1361,7 +1361,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 561fe148b58c9c8537e5634dec2abaf2720eec74..9a7227aee98281fdddddd36f2b3723289ae67f37 100644 (file)
--- a/server/ctdb_banning.c
+++ b/server/ctdb_banning.c
@@ -42,7 +42,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;
 
@@ -61,8 +61,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)
@@ -124,7 +122,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 6d36e3e7b25b575dd29c2de8227a837f76c50c28..283a5849a7d175c29ecf3aeedaa17a8673a5a4d4 100644 (file)
--- a/server/ctdb_monitor.c
+++ b/server/ctdb_monitor.c
@@ -493,7 +493,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;