summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Bellur <vijay@gluster.com>2010-09-18 06:31:33 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-18 05:19:30 -0700
commitfaa817ea9cb119c7f65fce24f03a172fa4b4ada1 (patch)
tree2958d05a25c22cbff2dbd6625769acb234886795
parent2bd9adb71d9b64799fef7978ff1da97fadab3056 (diff)
mgmt/glusterd: detach peer properly when msg submission fails
Signed-off-by: Vijay Bellur <vijay@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-store.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd3_1-mops.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
index a709fb200..498a063a5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-store.c
+++ b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -967,6 +967,9 @@ glusterd_store_retrieve_volume (char *volname)
} else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_PORT,
strlen (GLUSTERD_STORE_KEY_VOL_PORT))) {
volinfo->port = atoi (value);
+ } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_SUB_COUNT,
+ strlen (GLUSTERD_STORE_KEY_VOL_SUB_COUNT))) {
+ volinfo->sub_count = atoi (value);
} else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_TRANSPORT,
strlen (GLUSTERD_STORE_KEY_VOL_TRANSPORT))) {
volinfo->transport_type = atoi (value);
diff --git a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
index 1f0b2a785..5f0ab79ca 100644
--- a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
+++ b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c
@@ -286,7 +286,7 @@ glusterd3_1_friend_remove_cbk (struct rpc_req * req, struct iovec *iov,
goto respond;
inject:
- ret = glusterd_friend_find (rsp.uuid, rsp.hostname, &peerinfo);
+ ret = glusterd_friend_find (rsp.uuid, ctx->hostname, &peerinfo);
if (ret) {
//can happen as part of rpc clnt connection cleanup