ctdb-protocol: CTDB_CONTROL_SET_RECLOCK_FILE is 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 1b84d546046460c7206f47f313c55f124a464fb7..a46d6543a5d8cb95e1a6f76b84d2839aa3a47860 100644 (file)
--- a/ctdb/protocol/protocol.h
+++ b/ctdb/protocol/protocol.h
@@ -313,7 +313,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS          = 0,
                    CTDB_CONTROL_TRAVERSE_KILL           = 97,
                    CTDB_CONTROL_RECD_RECLOCK_LATENCY    = 98,
                    CTDB_CONTROL_GET_RECLOCK_FILE        = 99,
-                   CTDB_CONTROL_SET_RECLOCK_FILE        = 100,
+                   CTDB_CONTROL_SET_RECLOCK_FILE        = 100, /* obsolete */
                    CTDB_CONTROL_STOP_NODE               = 101,
                    CTDB_CONTROL_CONTINUE_NODE           = 102,
                    CTDB_CONTROL_SET_NATGWSTATE          = 103, /* obsolete */

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 9819176c97046ce8b0c569429d5a20d7c2dfd7a7..27ebe6c4449786e754d3bfa568af62c10eae7581 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -514,36 +514,8 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                        outdata->dsize = strlen(ctdb->recovery_lock_file) + 1;
                }
                return 0;
-       case CTDB_CONTROL_SET_RECLOCK_FILE: {
-               char *t;
-
-               if (indata.dsize == 0) {
-                       TALLOC_FREE(ctdb->recovery_lock_file);
-                       return 0;
-               }
-
-               /* Return silent success if unchanged.  Recovery
-                * master updates all nodes on each recovery - we
-                * don't need the extra memory allocation or log
-                * message each time. */
-               if (ctdb->recovery_lock_file != NULL &&
-                   strcmp(discard_const(indata.dptr),
-                          ctdb->recovery_lock_file) == 0) {
-                       return 0;
-               }
-
-               t = talloc_strdup(ctdb, discard_const(indata.dptr));
-               if (t == NULL) {
-                       DEBUG(DEBUG_ERR, ("Out of memory in SET_RECLOCK_FILE\n"));
-                       return -1;
-               }
-
-               talloc_free(ctdb->recovery_lock_file);
-               ctdb->recovery_lock_file = t;
-               DEBUG(DEBUG_NOTICE, ("Updated recovery lock file to %s\n", t));
-
-               return 0;
-       }
+       case CTDB_CONTROL_SET_RECLOCK_FILE:
+               return control_not_implemented("SET_RECLOCK", NULL);
 
        case CTDB_CONTROL_STOP_NODE:
                CHECK_CONTROL_DATA_SIZE(0);