diff options
| author | Raghavendra Bhat <raghavendra@redhat.com> | 2014-07-01 11:57:19 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2014-07-01 01:58:58 -0700 |
| commit | 991dd5e4709296d80358d6d076507635c6b3b1e1 (patch) | |
| tree | 51ad2b99ca675e3e07404af9cf4ef3a2c983565f | |
| parent | c6f040524d75011c44dcc9afdfef80c60c78f7f7 (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>
| -rw-r--r-- | tests/bugs/bug-1111041.t | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/bugs/bug-1111041.t b/tests/bugs/bug-1111041.t index d6cf2e91df0..2ff5294f238 100644 --- a/tests/bugs/bug-1111041.t +++ b/tests/bugs/bug-1111041.t @@ -8,7 +8,7 @@ cleanup; function is_snapd_running { - $CLI volume status $1 | grep "Snap Daemon" | wc -l; + $CLI volume status $1 | grep "Snapshot Daemon" | wc -l; } TEST glusterd; @@ -29,7 +29,7 @@ SNAPD_PID=$(ps aux | grep snapd | grep -v grep | awk '{print $2}'); TEST [ $SNAPD_PID -gt 0 ]; -SNAPD_PID2=$($CLI volume status $V0 | grep "Snap Daemon" | awk {'print $7'}); +SNAPD_PID2=$($CLI volume status $V0 | grep "Snapshot Daemon" | awk {'print $7'}); TEST [ $SNAPD_PID -eq $SNAPD_PID2 ] 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; |