ctdb-daemon: Drop interface monitoring

This is done by 10.interace where the monitor event fails when there
is a missing interface.  The in-daemon interface checking adds no
value.

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

diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index f5876a62a663094d0863e57a28c9513aefe685b0..1dd0a6d804ef329becd257fad16644e92a75afa8 100644 (file)
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1311,9 +1311,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
                        DEBUG(DEBUG_ALERT,("Unable to setup public address list\n"));
                        exit(1);
                }
-               if (ctdb->do_checkpublicip) {
-                       ctdb_start_monitoring_interfaces(ctdb);
-               }
        }
 
        ctdb_initialise_vnn_map(ctdb);

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 6509ebfec3a086c6815d10063cf13cf292d3a568..556b2479bf7290887a7716447afd6dd2e627ad2e 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1140,51 +1140,6 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
        return 0;
 }
 
-static void ctdb_check_interfaces_event(struct event_context *ev, struct timed_event *te, 
-                                 struct timeval t, void *private_data)
-{
-       struct ctdb_context *ctdb = talloc_get_type(private_data, 
-                                                       struct ctdb_context);
-       struct ctdb_vnn *vnn;
-
-       for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
-               int i;
-
-               for (i=0; vnn->ifaces[i] != NULL; i++) {
-                       if (!ctdb_sys_check_iface_exists(vnn->ifaces[i])) {
-                               DEBUG(DEBUG_CRIT,("Interface %s does not exist but is used by public ip %s\n",
-                                       vnn->ifaces[i],
-                                       ctdb_addr_to_str(&vnn->public_address)));
-                       }
-               }
-       }
-
-       event_add_timed(ctdb->ev, ctdb->check_public_ifaces_ctx, 
-               timeval_current_ofs(30, 0), 
-               ctdb_check_interfaces_event, ctdb);
-}
-
-
-int ctdb_start_monitoring_interfaces(struct ctdb_context *ctdb)
-{
-       if (ctdb->check_public_ifaces_ctx != NULL) {
-               talloc_free(ctdb->check_public_ifaces_ctx);
-               ctdb->check_public_ifaces_ctx = NULL;
-       }
-
-       ctdb->check_public_ifaces_ctx = talloc_new(ctdb);
-       if (ctdb->check_public_ifaces_ctx == NULL) {
-               ctdb_fatal(ctdb, "failed to allocate context for checking interfaces");
-       }
-
-       event_add_timed(ctdb->ev, ctdb->check_public_ifaces_ctx, 
-               timeval_current_ofs(30, 0), 
-               ctdb_check_interfaces_event, ctdb);
-
-       return 0;
-}
-
-
 /*
   setup the public address lists from a file
 */