From 0049c2405aa39fe4ef299bd646e7a53e40753039 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Mon, 16 Apr 2012 19:31:44 +0530 Subject: glusterd : Fixes for breakages caused by volume-id validation Fixes glusterd_op_build_payload() to, 1. take account of status cmd type when building payload for "volume status" to prevent "volume status all" from failing. 2. take account of volname being "help/help-xml" in volume set to prevent "volume set help/help-xml" from failing 3. obtain volname using key "master" prevent "volume geo-replication" commands from failing Also, fails op and sets correct op_errstr if volume not found during glusterd_dict_set_volid(), to make sure cli displays proper message. Change-Id: I40ded15c50b54a82ee61bf6d6e9d07f571679c8c BUG: 812801 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.com/3157 Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi --- xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.h') diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 047ff2f3d3..7ea2995d08 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -191,7 +191,7 @@ int32_t glusterd_op_set_op (glusterd_op_t op); int -glusterd_op_build_payload (dict_t **req); +glusterd_op_build_payload (dict_t **req, char **op_errstr); int32_t glusterd_op_stage_validate (glusterd_op_t op, dict_t *req, char **op_errstr, -- cgit