diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-09-04 14:44:16 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2017-09-14 14:49:16 +0200 |
| commit | 64225c63dd982b34154c2e2b4a92e610c29183bd (patch) | |
| tree | 639e8b4b559b5a1c6bc3001f38bdf9bc300a569b /ctdb/server | |
| parent | 690e3e13f22e1dd11d9a1d25659ff549f4aa8488 (diff) | |
| download | samba-64225c63dd982b34154c2e2b4a92e610c29183bd.tar.gz | |
ctdb-daemon: Drop monitoring mode
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index b749d233618..2ecbbb393c0 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -37,7 +37,6 @@ #include "common/logging.h" struct ctdb_monitor_state { - uint32_t monitoring_mode; TALLOC_CTX *monitor_context; uint32_t next_interval; uint32_t event_script_timeouts; @@ -241,8 +240,6 @@ static void ctdb_startup_callback(struct ctdb_context *ctdb, int status, void *p ctdb->monitor->next_interval = 2; ctdb_run_notification_script(ctdb, "startup"); - ctdb->monitor->monitoring_mode = CTDB_MONITORING_ENABLED; - tevent_add_timer(ctdb->ev, ctdb->monitor->monitor_context, timeval_current_ofs(ctdb->monitor->next_interval, 0), ctdb_check_health, ctdb); @@ -388,8 +385,7 @@ static void ctdb_check_health(struct tevent_context *ev, if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL || ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_INACTIVE || - ctdb->runstate != CTDB_RUNSTATE_RUNNING || - ctdb->monitor->monitoring_mode == CTDB_MONITORING_DISABLED) { + ctdb->runstate != CTDB_RUNSTATE_RUNNING) { skip_monitoring = true; } else { if (ctdb_db_all_frozen(ctdb)) { @@ -427,7 +423,6 @@ void ctdb_stop_monitoring(struct ctdb_context *ctdb) talloc_free(ctdb->monitor->monitor_context); ctdb->monitor->monitor_context = NULL; - ctdb->monitor->monitoring_mode = CTDB_MONITORING_DISABLED; ctdb->monitor->next_interval = 5; DEBUG(DEBUG_NOTICE,("Monitoring has been stopped\n")); } |