summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-09-23 09:18:37 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-23 07:58:16 -0700
commitc5a5fea9e6a1f1709e6826c1eea89dfd25cc496b (patch)
tree0f8abfa9c32e17c08fd33666183f0cc54118570f /glusterfsd
parentfa3ca3c61fbd7ad95f57f0522624396b8f05ecf6 (diff)
mgmt/glusterd: Misc fixes to pump / cli / glusterd wrt replace brick.v3.1.0qa30v3.1.0beta
Patches from Vijay and Shishir have been pulled in into this one big patch. Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 1235 (Bug for all pump/migrate commits) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd-mgmt.c2
-rw-r--r--glusterfsd/src/glusterfsd.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index d9cc83a8133..7f1b52f5688 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -592,6 +592,7 @@ mgmt_pmap_signout_cbk (struct rpc_req *req, struct iovec *iov, int count,
pmap_signout_rsp rsp = {0,};
call_frame_t *frame = NULL;
int ret = 0;
+ glusterfs_ctx_t *ctx = NULL;
frame = myframe;
@@ -601,6 +602,7 @@ mgmt_pmap_signout_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto out;
}
+ ctx = glusterfs_ctx_get ();
ret = xdr_to_pmap_signout_rsp (*iov, &rsp);
if (ret < 0) {
gf_log ("", GF_LOG_ERROR, "error");
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index e383f96fd86..d73be8fdd3e 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -645,6 +645,7 @@ cleanup_and_exit (int signum)
/* TODO: is this the right place? */
glusterfs_mgmt_pmap_signout (ctx);
+
if (ctx && ctx->mgmt)
rpc_clnt_destroy (ctx->mgmt);
@@ -664,7 +665,9 @@ cleanup_and_exit (int signum)
while (trav) {
if (trav->fini) {
THIS = trav;
+ gf_log ("", GF_LOG_NORMAL, "Calling fini for %s", trav->name);
trav->fini (trav);
+ gf_log ("", GF_LOG_NORMAL, "Done Calling fini for %s", trav->name);
}
trav = trav->next;
}