ctdb-protocol: Drop marshalling for {GET,SET}_RECMASTER controls

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

diff --git a/ctdb/protocol/protocol_control.c b/ctdb/protocol/protocol_control.c
index f64a1a90e105e15fdbb933cc341191376620a41f..a7c797f5dbca2d818d2cf91cab6417b0302860bb 100644 (file)
--- a/ctdb/protocol/protocol_control.c
+++ b/ctdb/protocol/protocol_control.c
@@ -118,13 +118,6 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               len = ctdb_uint32_len(&cd->data.recmaster);
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;
 
@@ -477,10 +470,6 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
                ctdb_uint32_push(&cd->data.db_id, buf, &np);
                break;
 
-       case CTDB_CONTROL_SET_RECMASTER:
-               ctdb_uint32_push(&cd->data.recmaster, buf, &np);
-               break;
-
        case CTDB_CONTROL_TCP_CLIENT:
                ctdb_connection_push(cd->data.conn, buf, &np);
                break;
@@ -767,10 +756,6 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
                ret = ctdb_uint32_pull(buf, buflen, &cd->data.db_id, &np);
                break;
 
-       case CTDB_CONTROL_SET_RECMASTER:
-               ret = ctdb_uint32_pull(buf, buflen, &cd->data.recmaster, &np);
-               break;
-
        case CTDB_CONTROL_TCP_CLIENT:
                ret = ctdb_connection_pull(buf, buflen, mem_ctx,
                                           &cd->data.conn, &np);
@@ -1127,12 +1112,6 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;
 
@@ -1443,9 +1422,6 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
        case CTDB_CONTROL_GET_TUNABLE:
                ctdb_uint32_push(&cd->data.tun_value, buf, &np);
                break;
@@ -1611,9 +1587,6 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
        case CTDB_CONTROL_GET_TUNABLE:
                ret = ctdb_uint32_pull(buf, buflen, &cd->data.tun_value,
                                       &np);

diff --git a/ctdb/tests/src/protocol_common_ctdb.c b/ctdb/tests/src/protocol_common_ctdb.c
index 61c5c514f9aa972f4c1d3674c8e0e34c92bfb267..384076824a47a8597e282f8000c7dd23ce1b385b 100644 (file)
--- a/ctdb/tests/src/protocol_common_ctdb.c
+++ b/ctdb/tests/src/protocol_common_ctdb.c
@@ -233,13 +233,6 @@ void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               cd->data.recmaster = rand_int(32);
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;
 
@@ -692,13 +685,6 @@ void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               assert(cd->data.recmaster == cd2->data.recmaster);
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;
 
@@ -1116,12 +1102,6 @@ void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;
 
@@ -1484,12 +1464,6 @@ void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
        case CTDB_CONTROL_GET_PID:
                break;
 
-       case CTDB_CONTROL_GET_RECMASTER:
-               break;
-
-       case CTDB_CONTROL_SET_RECMASTER:
-               break;
-
        case CTDB_CONTROL_FREEZE:
                break;