diff options
| author | Kaushal M <kaushal@redhat.com> | 2012-04-16 19:31:44 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-17 06:26:15 -0700 |
| commit | 0049c2405aa39fe4ef299bd646e7a53e40753039 (patch) | |
| tree | dd3add3ff1cc354c0434b98e9decac9a03b8428b /xlators/mgmt/glusterd/src/glusterd-op-sm.h | |
| parent | 79620e8f63148b1ad7d8180da46176a759435590 (diff) | |
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 <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3157
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kp@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 047ff2f3d3d..7ea2995d08c 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, |