diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2016-07-22 15:41:59 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-07-28 05:00:17 +0200 |
| commit | 0a759bc3ff3887671981e03e1898acf5da692bc2 (patch) | |
| tree | dc4ee1f0791789a2368855adcd890ebbb5ac43d1 /ctdb | |
| parent | 5dc18882fdbaed627262156dd453e6a8a2c0140f (diff) | |
| download | samba-0a759bc3ff3887671981e03e1898acf5da692bc2.tar.gz | |
ctdb-daemon: Use consistent naming for monitoring mode
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/protocol/protocol.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 4 | ||||
| -rw-r--r-- | ctdb/tests/src/fake_ctdbd.c | 4 | ||||
| -rw-r--r-- | ctdb/tools/ctdb.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h index ae8e300142b..01a62787251 100644 --- a/ctdb/protocol/protocol.h +++ b/ctdb/protocol/protocol.h @@ -363,7 +363,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_DB_PUSH_CONFIRM = 148, }; -#define CTDB_MONITORING_ACTIVE 0 +#define CTDB_MONITORING_ENABLED 0 #define CTDB_MONITORING_DISABLED 1 #define MAX_COUNT_BUCKETS 16 diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 1ece7c8add1..87a38c708ee 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -242,7 +242,7 @@ 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_ACTIVE; + ctdb->monitor->monitoring_mode = CTDB_MONITORING_ENABLED; tevent_add_timer(ctdb->ev, ctdb->monitor->monitor_context, timeval_current_ofs(ctdb->monitor->next_interval, 0), @@ -436,7 +436,7 @@ void ctdb_disable_monitoring(struct ctdb_context *ctdb) */ void ctdb_enable_monitoring(struct ctdb_context *ctdb) { - ctdb->monitor->monitoring_mode = CTDB_MONITORING_ACTIVE; + ctdb->monitor->monitoring_mode = CTDB_MONITORING_ENABLED; ctdb->monitor->next_interval = 5; DEBUG(DEBUG_INFO,("Monitoring has been enabled\n")); } diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c index 11fecc32f33..bd7a103ec63 100644 --- a/ctdb/tests/src/fake_ctdbd.c +++ b/ctdb/tests/src/fake_ctdbd.c @@ -790,7 +790,7 @@ static struct ctdbd_context *ctdbd_setup(TALLOC_CTX *mem_ctx) ctdb_tunable_set_defaults(&ctdb->tun_list); - ctdb->monitoring_mode = CTDB_MONITORING_ACTIVE; + ctdb->monitoring_mode = CTDB_MONITORING_ENABLED; return ctdb; @@ -1778,7 +1778,7 @@ static void control_enable_monitor(TALLOC_CTX *mem_ctx, struct ctdbd_context *ctdb = state->ctdb; struct ctdb_reply_control reply; - ctdb->monitoring_mode = CTDB_MONITORING_ACTIVE; + ctdb->monitoring_mode = CTDB_MONITORING_ENABLED; reply.rdata.opcode = request->opcode; reply.status = 0; diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 354d1f9c8a5..d44c7a2f5c4 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -2954,7 +2954,7 @@ static int control_getmonmode(struct ctdb_context *ctdb, int argc, const char ** return ret; } printf("%s\n", - monmode==CTDB_MONITORING_ACTIVE ? "ENABLED" : "DISABLED"); + monmode==CTDB_MONITORING_ENABLED ? "ENABLED" : "DISABLED"); return 0; } |