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

report the error if a volume not in the started state is tried to be stopped

Browse Source 
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 2010 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2010
This commit is contained in:
Raghavendra Bhat 2010-10-26 05:20:34 +00:00 committed by Anand V. Avati
parent a53d14d5f5
commit a7d41a64fb
5 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli/src/cli3_1-cops.c
View File

@ -730,6 +730,9 @@ gf_cli3_1_stop_volume_cbk (struct rpc_req *req, struct iovec *iov,
cli_out ("Stopping volume %s has been %s", volname,
(rsp.op_ret) ? "unsuccessful": "successful");
if (rsp.op_ret && rsp.op_errstr)
cli_out ("%s", rsp.op_errstr);
ret = rsp.op_ret;
out:

4
rpc/xdr/src/cli1-xdr.c
View File

@ -316,7 +316,9 @@ xdr_gf1_cli_stop_vol_rsp (XDR *xdrs, gf1_cli_stop_vol_rsp *objp)
return FALSE;
if (!xdr_string (xdrs, &objp->volname, ~0))
return FALSE;
return TRUE;
if (!xdr_string (xdrs, &objp->op_errstr, ~0))
return FALSE;
return TRUE;
}
bool_t

1
rpc/xdr/src/cli1-xdr.h
View File

@ -194,6 +194,7 @@ struct gf1_cli_stop_vol_rsp {
int op_ret;
int op_errno;
char *volname;
char *op_errstr;
};
typedef struct gf1_cli_stop_vol_rsp gf1_cli_stop_vol_rsp;

1
rpc/xdr/src/cli1.x
View File

@ -123,6 +123,7 @@ struct gf1_cli_get_vol_rsp {
int op_ret;
int op_errno;
string volname<>;
string op_errstr<>;
} ;

12
xlators/mgmt/glusterd/src/glusterd-op-sm.c
View File

@ -559,7 +559,7 @@ out:
}
static int
glusterd_op_stage_stop_volume (gd1_mgmt_stage_op_req *req)
glusterd_op_stage_stop_volume (gd1_mgmt_stage_op_req *req, char **op_errstr)
{
int ret = -1;
dict_t *dict = NULL;
@ -567,6 +567,7 @@ glusterd_op_stage_stop_volume (gd1_mgmt_stage_op_req *req)
int flags = 0;
gf_boolean_t exists = _gf_false;
glusterd_volinfo_t *volinfo = NULL;
char msg[2048] = {0,};
dict = dict_new ();
if (!dict)
@ -595,8 +596,11 @@ glusterd_op_stage_stop_volume (gd1_mgmt_stage_op_req *req)
ret = glusterd_is_volume_started (volinfo);
if (ret) {
snprintf (msg, sizeof(msg), "Volume %s "
"is not in the started state", volname);
gf_log ("", GF_LOG_ERROR, "Volume %s "
"has not been started", volname);
*op_errstr = gf_strdup (msg);
goto out;
}
}
@ -4408,6 +4412,10 @@ glusterd_op_send_cli_response (int32_t op, int32_t op_ret,
rsp.op_ret = op_ret;
rsp.op_errno = op_errno;
rsp.volname = "";
if (op_errstr)
rsp.op_errstr = op_errstr;
else
rsp.op_errstr = "";
cli_rsp = &rsp;
sfunc = gf_xdr_serialize_cli_stop_vol_rsp;
break;
@ -4795,7 +4803,7 @@ glusterd_op_stage_validate (gd1_mgmt_stage_op_req *req, char **op_errstr,
break;
case GD_OP_STOP_VOLUME:
ret = glusterd_op_stage_stop_volume (req);
ret = glusterd_op_stage_stop_volume (req, op_errstr);
break;
case GD_OP_DELETE_VOLUME: