diff options
| author | Martin Schwenke <martin@meltin.net> | 2017-09-04 14:22:44 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2017-09-14 14:49:15 +0200 |
| commit | 74f29a48dbbb980f7e22783e80cee03feb2c18de (patch) | |
| tree | 58bb6ec425b501edae6588b13b4d70f9b495a07e | |
| parent | 4b01621912b75b3bf5cfe1473f94a6b8aff5ddbf (diff) | |
| download | samba-74f29a48dbbb980f7e22783e80cee03feb2c18de.tar.gz | |
ctdb-daemon: Mark monitoring controls obsolete
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | ctdb/protocol/protocol.h | 6 | ||||
| -rw-r--r-- | ctdb/server/ctdb_control.c | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h index c61b97249a6..7551cc463cd 100644 --- a/ctdb/protocol/protocol.h +++ b/ctdb/protocol/protocol.h @@ -259,7 +259,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_THAW = 34, /* obsolete */ CTDB_CONTROL_GET_PNN = 35, CTDB_CONTROL_SHUTDOWN = 36, - CTDB_CONTROL_GET_MONMODE = 37, + CTDB_CONTROL_GET_MONMODE = 37, /* obsolete */ /* #38 removed */ /* #39 removed */ /* #40 removed */ @@ -297,8 +297,8 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS = 0, CTDB_CONTROL_RELOAD_NODES_FILE = 72, /* #73 removed */ CTDB_CONTROL_TRY_DELETE_RECORDS = 74, - CTDB_CONTROL_ENABLE_MONITOR = 75, - CTDB_CONTROL_DISABLE_MONITOR = 76, + CTDB_CONTROL_ENABLE_MONITOR = 75, /* obsolete */ + CTDB_CONTROL_DISABLE_MONITOR = 76, /* obsolete */ CTDB_CONTROL_ADD_PUBLIC_IP = 77, CTDB_CONTROL_DEL_PUBLIC_IP = 78, CTDB_CONTROL_RUN_EVENTSCRIPTS = 79, /* obsolete */ diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index 6e9bbeb2ff5..9f74011e0a5 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -332,22 +332,17 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t)); return ctdb_control_set_recmode(ctdb, c, indata, async_reply, errormsg); - case CTDB_CONTROL_GET_MONMODE: - CHECK_CONTROL_DATA_SIZE(0); - return ctdb_monitoring_mode(ctdb); - - case CTDB_CONTROL_ENABLE_MONITOR: - CHECK_CONTROL_DATA_SIZE(0); - ctdb_enable_monitoring(ctdb); - return 0; + case CTDB_CONTROL_GET_MONMODE: + return control_not_implemented("GET_MONMODE", NULL); + + case CTDB_CONTROL_ENABLE_MONITOR: + return control_not_implemented("ENABLE_MONITOR", NULL); case CTDB_CONTROL_RUN_EVENTSCRIPTS: return control_not_implemented("RUN_EVENTSCRIPTS", NULL); - case CTDB_CONTROL_DISABLE_MONITOR: - CHECK_CONTROL_DATA_SIZE(0); - ctdb_disable_monitoring(ctdb); - return 0; + case CTDB_CONTROL_DISABLE_MONITOR: + return control_not_implemented("DISABLE_MONITOR", NULL); case CTDB_CONTROL_SHUTDOWN: DEBUG(DEBUG_NOTICE,("Received SHUTDOWN command.\n")); |