glusterd/tier: remove tier related code from glusterd

The handler functions are pointed to dummy functions.
The switch case handling for tier also have been moved to
point default case to avoid issues, if reintroduced.

The tier changes in DHT still remain as such.

updates: bz#1693692

Change-Id: I80d80c9a3eb862b4440a36b31ae82b2e9d92e4dc
Signed-off-by: Hari Gowtham <hgowtham@redhat.com>

1 files changed, 2 insertions, 146 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
index b66d44f9d0a..30c53c39dff 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
@@ -160,7 +160,6 @@ gd_mgmt_v3_pre_validate_fn(glusterd_op_t op, dict_t *dict, char **op_errstr,
                 goto out;
             }
             break;
-        case GD_OP_ADD_TIER_BRICK:
         case GD_OP_ADD_BRICK:
             ret = glusterd_op_stage_add_brick(dict, op_errstr, rsp_dict);
             if (ret) {
@@ -188,19 +187,6 @@ gd_mgmt_v3_pre_validate_fn(glusterd_op_t op, dict_t *dict, char **op_errstr,
                 goto out;
             }
             break;
-        case GD_OP_TIER_START_STOP:
-        case GD_OP_TIER_STATUS:
-        case GD_OP_DETACH_TIER_STATUS:
-        case GD_OP_REMOVE_TIER_BRICK:
-            ret = glusterd_op_stage_tier(dict, op_errstr, rsp_dict);
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_COMMAND_NOT_FOUND,
-                       "tier "
-                       "prevalidation failed");
-                goto out;
-            }
-            break;
-
         case GD_OP_RESET_BRICK:
             ret = glusterd_reset_brick_prevalidate(dict, op_errstr, rsp_dict);
             if (ret) {
@@ -296,7 +282,6 @@ gd_mgmt_v3_commit_fn(glusterd_op_t op, dict_t *dict, char **op_errstr,
 {
     int32_t ret = -1;
     xlator_t *this = NULL;
-    int32_t cmd = 0;
 
     this = THIS;
     GF_ASSERT(this);
@@ -370,51 +355,6 @@ gd_mgmt_v3_commit_fn(glusterd_op_t op, dict_t *dict, char **op_errstr,
             }
             break;
         }
-        case GD_OP_TIER_START_STOP: {
-            ret = glusterd_op_tier_start_stop(dict, op_errstr, rsp_dict);
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_COMMIT_OP_FAIL,
-                       "tier commit failed.");
-                goto out;
-            }
-            break;
-        }
-        case GD_OP_REMOVE_TIER_BRICK: {
-            ret = glusterd_op_remove_tier_brick(dict, op_errstr, rsp_dict);
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_COMMIT_OP_FAIL,
-                       "tier detach commit failed.");
-                goto out;
-            }
-            ret = dict_get_int32n(dict, "rebalance-command",
-                                  SLEN("rebalance-command"), &cmd);
-            if (ret) {
-                gf_msg_debug(this->name, 0, "cmd not found");
-                goto out;
-            }
-
-            if (cmd != GF_DEFRAG_CMD_DETACH_STOP)
-                break;
-        }
-        case GD_OP_DETACH_TIER_STATUS:
-        case GD_OP_TIER_STATUS: {
-            ret = glusterd_op_tier_status(dict, op_errstr, rsp_dict, op);
-            if (ret) {
-                gf_msg(this->name, GF_LOG_WARNING, 0, GD_MSG_COMMIT_OP_FAIL,
-                       "tier status commit failed");
-                goto out;
-            }
-            break;
-        }
-        case GD_OP_ADD_TIER_BRICK: {
-            ret = glusterd_op_add_tier_brick(dict, op_errstr);
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_COMMIT_OP_FAIL,
-                       "tier add-brick commit failed.");
-                goto out;
-            }
-            break;
-        }
         case GD_OP_PROFILE_VOLUME: {
             ret = glusterd_op_stats_volume(dict, op_errstr, rsp_dict);
             if (ret) {
@@ -453,7 +393,6 @@ gd_mgmt_v3_post_validate_fn(glusterd_op_t op, int32_t op_ret, dict_t *dict,
     xlator_t *this = NULL;
     char *volname = NULL;
     glusterd_volinfo_t *volinfo = NULL;
-    glusterd_svc_t *svc = NULL;
 
     this = THIS;
     GF_ASSERT(this);
@@ -518,12 +457,6 @@ gd_mgmt_v3_post_validate_fn(glusterd_op_t op, int32_t op_ret, dict_t *dict,
                 goto out;
             }
 
-            if (volinfo->type == GF_CLUSTER_TYPE_TIER) {
-                svc = &(volinfo->tierd.svc);
-                ret = svc->manager(svc, volinfo, PROC_START_NO_WAIT);
-                if (ret)
-                    goto out;
-            }
             break;
         }
         case GD_OP_STOP_VOLUME: {
@@ -544,49 +477,6 @@ gd_mgmt_v3_post_validate_fn(glusterd_op_t op, int32_t op_ret, dict_t *dict,
             }
             break;
         }
-        case GD_OP_ADD_TIER_BRICK: {
-            ret = dict_get_strn(dict, "volname", SLEN("volname"), &volname);
-            if (ret) {
-                gf_msg("glusterd", GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                       "Unable to get"
-                       " volume name");
-                goto out;
-            }
-
-            ret = glusterd_volinfo_find(volname, &volinfo);
-            if (ret) {
-                gf_msg("glusterd", GF_LOG_ERROR, EINVAL, GD_MSG_VOL_NOT_FOUND,
-                       "Unable to "
-                       "allocate memory");
-                goto out;
-            }
-            ret = glusterd_create_volfiles_and_notify_services(volinfo);
-            if (ret)
-                goto out;
-            ret = glusterd_store_volinfo(volinfo,
-                                         GLUSTERD_VOLINFO_VER_AC_INCREMENT);
-            if (ret)
-                goto out;
-            ret = dict_get_strn(dict, "volname", SLEN("volname"), &volname);
-            if (ret) {
-                gf_msg("glusterd", GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                       "Unable to get"
-                       " volume name");
-                goto out;
-            }
-
-            if (ret) {
-                gf_msg(this->name, GF_LOG_ERROR, errno, GD_MSG_DICT_SET_FAILED,
-                       "dict set "
-                       "failed");
-                goto out;
-            }
-            ret = -1;
-            svc = &(volinfo->tierd.svc);
-            ret = svc->manager(svc, volinfo, PROC_START_NO_WAIT);
-            if (ret)
-                goto out;
-        }
 
         default:
             break;
@@ -851,7 +741,6 @@ glusterd_pre_validate_aggr_rsp_dict(glusterd_op_t op, dict_t *aggr, dict_t *rsp)
             break;
         case GD_OP_START_VOLUME:
         case GD_OP_ADD_BRICK:
-        case GD_OP_ADD_TIER_BRICK:
             ret = glusterd_aggr_brick_mount_dirs(aggr, rsp);
             if (ret) {
                 gf_msg(this->name, GF_LOG_ERROR, 0,
@@ -870,10 +759,6 @@ glusterd_pre_validate_aggr_rsp_dict(glusterd_op_t op, dict_t *aggr, dict_t *rsp)
                 goto out;
             }
         case GD_OP_STOP_VOLUME:
-        case GD_OP_TIER_STATUS:
-        case GD_OP_DETACH_TIER_STATUS:
-        case GD_OP_TIER_START_STOP:
-        case GD_OP_REMOVE_TIER_BRICK:
         case GD_OP_PROFILE_VOLUME:
         case GD_OP_DEFRAG_BRICK_VOLUME:
         case GD_OP_REBALANCE:
@@ -1193,7 +1078,6 @@ glusterd_mgmt_v3_build_payload(dict_t **req, char **op_errstr, dict_t *dict,
         case GD_OP_DEFRAG_BRICK_VOLUME:
         case GD_OP_REPLACE_BRICK:
         case GD_OP_RESET_BRICK:
-        case GD_OP_ADD_TIER_BRICK:
         case GD_OP_PROFILE_VOLUME: {
             ret = dict_get_strn(dict, "volname", SLEN("volname"), &volname);
             if (ret) {
@@ -1234,12 +1118,6 @@ glusterd_mgmt_v3_build_payload(dict_t **req, char **op_errstr, dict_t *dict,
             dict_copy(dict, req_dict);
         } break;
 
-        case GD_OP_TIER_START_STOP:
-        case GD_OP_REMOVE_TIER_BRICK:
-        case GD_OP_DETACH_TIER_STATUS:
-        case GD_OP_TIER_STATUS:
-            dict_copy(dict, req_dict);
-            break;
         default:
             break;
     }
@@ -1669,7 +1547,6 @@ glusterd_mgmt_v3_commit(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict,
     uuid_t peer_uuid = {0};
     xlator_t *this = NULL;
     glusterd_conf_t *conf = NULL;
-    int32_t count = 0;
 
     this = THIS;
     GF_ASSERT(this);
@@ -1743,22 +1620,9 @@ glusterd_mgmt_v3_commit(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict,
          */
         if (peerinfo->generation > txn_generation)
             continue;
-
-        if (!peerinfo->connected) {
-            if (op == GD_OP_TIER_STATUS || op == GD_OP_DETACH_TIER_STATUS) {
-                ret = dict_get_int32n(args.dict, "count", SLEN("count"),
-                                      &count);
-                if (ret)
-                    gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                           "failed to get index");
-                count++;
-                ret = dict_set_int32n(args.dict, "count", SLEN("count"), count);
-                if (ret)
-                    gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED,
-                           "failed to set index");
-            }
+        if (!peerinfo->connected)
             continue;
-        }
+
         if (op != GD_OP_SYNC_VOLUME &&
             peerinfo->state.state != GD_FRIEND_STATE_BEFRIENDED)
             continue;
@@ -1937,14 +1801,6 @@ glusterd_mgmt_v3_post_validate(glusterd_op_t op, int32_t op_ret, dict_t *dict,
         goto out;
     }
 
-    /* Copy the contents of dict like missed snaps info to req_dict */
-    if (op != GD_OP_REMOVE_TIER_BRICK)
-        /* dict and req_dict has the same values during remove tier
-         * brick (detach start) So this rewrite make the remove brick
-         * id to become empty.
-         * Avoiding to copy it retains the value. */
-        dict_copy(dict, req_dict);
-
     /* Post Validation on local node */
     ret = gd_mgmt_v3_post_validate_fn(op, op_ret, req_dict, op_errstr,
                                       rsp_dict);