ctdb-daemon: Mark monitoring controls obsolete

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

diff --git a/ctdb/protocol/protocol.h b/ctdb/protocol/protocol.h
index c61b97249a6ecad5a5461c78e16acb6ab05b3824..7551cc463cd25e2760d8fa8c22197317343e2927 100644 (file)
--- 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 6e9bbeb2ff5d5de5b9d1966d2783751580b7be80..9f74011e0a58b76cd33a13ec7c66e2fd35589523 100644 (file)
--- 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"));