summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendra@redhat.com>2014-07-01 11:57:19 +0530
committerKaushal M <kaushal@redhat.com>2014-07-01 01:58:58 -0700
commit991dd5e4709296d80358d6d076507635c6b3b1e1 (patch)
tree51ad2b99ca675e3e07404af9cf4ef3a2c983565f /xlators
parentc6f040524d75011c44dcc9afdfef80c60c78f7f7 (diff)
mgmt/glusterd: use the right rpc for snapd while getting pending node rpc
* Also changed the testcase bug-1111041.t to correctly get the snapshot daemon's pid Change-Id: I22c09a1e61f049f21f1886f8baa5ff421af3f8fa BUG: 1111041 Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-on: http://review.gluster.org/8209 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Sachin Pandit <spandit@redhat.com> Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 04a2e62ee65..fb677200a7e 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5808,7 +5808,7 @@ glusterd_pending_node_get_rpc (glusterd_pending_node_t *pending_node)
rpc = quotad->rpc;
} else if (pending_node->type == GD_NODE_SNAPD) {
snapd = pending_node->node;
- rpc = quotad->rpc;
+ rpc = snapd->rpc;
} else {
GF_ASSERT (0);
}
@@ -7522,7 +7522,7 @@ glusterd_add_snapd_to_dict (glusterd_volinfo_t *volinfo,
snprintf (base_key, sizeof (base_key), "brick%d", count);
snprintf (key, sizeof (key), "%s.hostname", base_key);
- ret = dict_set_str (dict, key, "Snap Daemon");
+ ret = dict_set_str (dict, key, "Snapshot Daemon");
if (ret)
goto out;