summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2012-09-12 12:38:43 +0530
committerAnand Avati <avati@redhat.com>2012-09-17 21:15:46 -0700
commit4d0895c966f38355950d22ce378579fd35b7c9b2 (patch)
treedaf6dc53e00bb1f8a589ac975cfaf253e652ad7a
parentb59296014303ae93367b8c38f158b3db28fbbe35 (diff)
glusterd: Fix remote processes not being shown in "volume status"
Also, refactor function name so it makes more sense. Change-Id: I3bd3e1bdcacb522ddf4f39d09f73be1c53915362 BUG: 856480 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/3933 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Amar Tumballi <amarts@redhat.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-rpc-ops.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
index e2a166ebe..0a31868c8 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
@@ -1006,9 +1006,10 @@ glusterd_volume_status_add_peer_rsp (dict_t *this, char *key, data_t *value,
int32_t index = 0;
int32_t ret = 0;
+ /* Skip the following keys, they are already present in the ctx_dict */
if (!strcmp (key, "count") || !strcmp (key, "cmd") ||
!strcmp (key, "brick-index-max") || !strcmp (key, "other-count"))
- return -1;
+ return 0;
rsp_ctx = data;
new_value = data_copy (value);
@@ -1033,7 +1034,7 @@ glusterd_volume_status_add_peer_rsp (dict_t *this, char *key, data_t *value,
}
int
-glusterd_volume_status_use_rsp_dict (dict_t *rsp_dict)
+glusterd_volume_status_copy_to_op_ctx_dict (dict_t *rsp_dict)
{
int ret = 0;
glusterd_status_rsp_conv_t rsp_ctx = {0};
@@ -1374,7 +1375,7 @@ glusterd_commit_op_cbk (struct rpc_req *req, struct iovec *iov,
break;
case GD_OP_STATUS_VOLUME:
- ret = glusterd_volume_status_use_rsp_dict (dict);
+ ret = glusterd_volume_status_copy_to_op_ctx_dict (dict);
if (ret)
goto out;
break;