From c5a5fea9e6a1f1709e6826c1eea89dfd25cc496b Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Thu, 23 Sep 2010 09:18:37 +0000 Subject: mgmt/glusterd: Misc fixes to pump / cli / glusterd wrt replace brick. Patches from Vijay and Shishir have been pulled in into this one big patch. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Vijay Bellur BUG: 1235 (Bug for all pump/migrate commits) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235 --- glusterfsd/src/glusterfsd-mgmt.c | 2 ++ glusterfsd/src/glusterfsd.c | 3 +++ 2 files changed, 5 insertions(+) (limited to 'glusterfsd') 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; } -- cgit