summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-rebalance.c
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-06-04 14:14:14 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-06-11 00:02:25 -0700
commitfefc8730e2a87db41d5f79c9853a14cab86715e5 (patch)
tree3280be08e5a41a3373fbac76bc52339fbc602fc5 /xlators/mgmt/glusterd/src/glusterd-rebalance.c
parent5c00a6c8163cc255e777823b99d516dfb5ef114e (diff)
glusterd/tier: glusterd crashed with detach-tier commit force
glusterd crashed when doing "detach-tier commit force" on a non-tiered volume. Change-Id: I884771893bb80bec46ae8642c2cfd7e54ab116a6 BUG: 1228112 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: Joseph Fernandes Reviewed-by: Dan Lambright <dlambrig@redhat.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-rebalance.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rebalance.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-rebalance.c b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
index 314372e..9f4b421 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rebalance.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rebalance.c
@@ -592,9 +592,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
* glusterfs-3.6 and higher. This is needed to prevent some data
* loss issues that could occur when older clients are connected
@@ -651,6 +657,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: