andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

glusterd/tier: glusterd crashed with detach-tier commit force

Browse Source 
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>
This commit is contained in:
Mohammed Rafi KC 2015-06-04 14:14:14 +05:30 committed by Krishnan Parthasarathi
parent 5c00a6c816
commit fefc8730e2
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/cli-rpc-ops.c
View File

@ -1779,7 +1779,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),

7
xlators/mgmt/glusterd/src/glusterd-brick-ops.c
View File

@ -1805,6 +1805,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;
}

9
xlators/mgmt/glusterd/src/glusterd-rebalance.c
View File

@ -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: