ctdb-daemon: Drop implementation of monitor controls

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

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index f5966cd94cdefd18b8752270ec7fd8b681edf680..9be81ff8603740f2e0952c173cb689852715bf6e 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -747,17 +747,12 @@ int32_t ctdb_control_get_db_statistics(struct ctdb_context *ctdb,
 int ctdb_set_notification_script(struct ctdb_context *ctdb, const char *script);
 void ctdb_run_notification_script(struct ctdb_context *ctdb, const char *event);
 
-void ctdb_disable_monitoring(struct ctdb_context *ctdb);
-void ctdb_enable_monitoring(struct ctdb_context *ctdb);
 void ctdb_stop_monitoring(struct ctdb_context *ctdb);
 
 void ctdb_wait_for_first_recovery(struct ctdb_context *ctdb);
 
 int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata);
 
-int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb);
-bool ctdb_stopped_monitoring(struct ctdb_context *ctdb);
-
 /* from ctdb_persistent.c */
 
 void ctdb_persistent_finish_trans3_commits(struct ctdb_context *ctdb);

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 90808b03c6fe586798b10af90b8dadf3c49c026b..b749d23361867754e96d79d8cc04ff0eb7aaf30d 100644 (file)
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -419,26 +419,6 @@ static void ctdb_check_health(struct tevent_context *ev,
        }
 }
 
-/* 
-  (Temporaily) Disabling monitoring will stop the monitor event scripts
-  from running   but node health checks will still occur
-*/
-void ctdb_disable_monitoring(struct ctdb_context *ctdb)
-{
-       ctdb->monitor->monitoring_mode = CTDB_MONITORING_DISABLED;
-       DEBUG(DEBUG_INFO,("Monitoring has been disabled\n"));
-}
-
-/* 
-   Re-enable running monitor events after they have been disabled
- */
-void ctdb_enable_monitoring(struct ctdb_context *ctdb)
-{
-       ctdb->monitor->monitoring_mode  = CTDB_MONITORING_ENABLED;
-       ctdb->monitor->next_interval = 5;
-       DEBUG(DEBUG_INFO,("Monitoring has been enabled\n"));
-}
-
 /* stop any monitoring 
    this should only be done when shutting down the daemon
 */
@@ -529,22 +509,3 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata)
 
        return 0;
 }
-
-/*
-  return the monitoring mode
- */
-int32_t ctdb_monitoring_mode(struct ctdb_context *ctdb)
-{
-       if (ctdb->monitor == NULL) {
-               return CTDB_MONITORING_DISABLED;
-       }
-       return ctdb->monitor->monitoring_mode;
-}
-
-/*
- * Check if monitoring has been stopped
- */
-bool ctdb_stopped_monitoring(struct ctdb_context *ctdb)
-{
-       return (ctdb->monitor->monitor_context == NULL ? true : false);
-}