From b9464c0b0efc95956b914a0ef25200a471b840c3 Mon Sep 17 00:00:00 2001
From: Mohammed Rafi KC <rkavunga@redhat.com>
Date: Thu, 4 Jun 2015 14:14:14 +0530
Subject: [PATCH 120/129] glusterd/tier: glusterd crashed with detach-tier commit force

this patch has is a back port of fix 11081

glusterd crashed when doing "detach-tier commit force" on a
non-tiered volume.

> Change-Id: I884771893bb80bec46ae8642c2cfd7e54ab116a6
> BUG:  1229274
> Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
> Reviewed-on: http://review.gluster.org/11081
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Tested-by: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
> Signed-off-by: Joseph Fernandes <josferna@redhat.com>

Change-Id: I884771893bb80bec46ae8642c2cfd7e54ab116a6
Reviewed-on: https://code.engineering.redhat.com/gerrit/50622
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
---
 cli/src/cli-rpc-ops.c                          |    2 +-
 xlators/mgmt/glusterd/src/glusterd-brick-ops.c |    7 +++++++
 xlators/mgmt/glusterd/src/glusterd-rebalance.c |    9 ++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 290028f..a834147 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -1784,7 +1784,7 @@ gf_cli_defrag_volume_cbk (struct rpc_req *req, struct iovec *iov,
                                   rsp.op_errstr);
                 }
         }
-        if (cmd == GF_DEFRAG_CMD_STATUS) {
+        if (cmd == GF_DEFRAG_CMD_STATUS || cmd == GF_DEFRAG_CMD_STATUS_TIER) {
                 if (rsp.op_ret == -1) {
                         if (strcmp (rsp.op_errstr, ""))
                                 snprintf (msg, sizeof (msg),
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
index a3fda98..7dc34c2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c
@@ -1888,6 +1888,13 @@ glusterd_op_stage_remove_brick (dict_t *dict, char **op_errstr)
                 break;
 
         case GF_OP_CMD_DETACH_COMMIT_FORCE:
+                if (volinfo->type != GF_CLUSTER_TYPE_TIER) {
+                        snprintf (msg, sizeof(msg), "volume %s is not a tier "
+                                  "volume", volinfo->volname);
+                        errstr = gf_strdup (msg);
+                        gf_log (this->name, GF_LOG_ERROR, "%s", errstr);
+                        goto out;
+                }
         case GF_OP_CMD_COMMIT_FORCE:
                 break;
         }
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 4fd95c2..8449bb2 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -606,9 +606,15 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr)
                 goto out;
         }
         switch (cmd) {
+        case GF_DEFRAG_CMD_START_TIER:
+                if (volinfo->type != GF_CLUSTER_TYPE_TIER) {
+                        gf_asprintf (op_errstr, "volume %s is not a tier "
+                                     "volume.", volinfo->volname);
+                        ret = -1;
+                        goto out;
+                }
         case GF_DEFRAG_CMD_START:
         case GF_DEFRAG_CMD_START_LAYOUT_FIX:
-        case GF_DEFRAG_CMD_START_TIER:
                 /* Check if the connected clients are all of version
                  * RHS-2.1u5 and higher. This is needed to prevent some data
                  * loss issues that could occur when older clients are connected
@@ -668,6 +674,7 @@ glusterd_op_stage_rebalance (dict_t *dict, char **op_errstr)
                         goto out;
                 }
                 break;
+        case GF_DEFRAG_CMD_STATUS_TIER:
         case GF_DEFRAG_CMD_STATUS:
         case GF_DEFRAG_CMD_STOP:
         case GF_DEFRAG_CMD_STOP_DETACH_TIER:
-- 
1.7.1