diff options
| author | Pranith K <pranithk@gluster.com> | 2011-03-10 02:18:22 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2011-03-10 08:09:30 -0800 |
| commit | d23585307a0e333c9b1ff627df4c7e30b3642201 (patch) | |
| tree | 0e900775fff91686474051cf55375966e7028eec /xlators | |
| parent | 45fd0d904d11f07f8b523af2d1357f081e3c5dc1 (diff) | |
rpc: Changes for handling unix domain sockets avoid race
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1965 (need a cmd to get io-stat details)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1965
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 6 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index b3e92965420..0db5992fc2c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -3004,7 +3004,7 @@ glusterd_friend_rpc_create (struct rpc_clnt **rpc, if (ret) goto out; - new_rpc = rpc_clnt_new (&rpc_cfg, options, this->ctx, this->name); + new_rpc = rpc_clnt_new (options, this->ctx, this->name); if (!new_rpc) { gf_log ("glusterd", GF_LOG_ERROR, @@ -3015,10 +3015,10 @@ glusterd_friend_rpc_create (struct rpc_clnt **rpc, ret = rpc_clnt_register_notify (new_rpc, glusterd_rpc_notify, peerctx); + if (ret) + goto out; *rpc = new_rpc; - rpc_clnt_start (new_rpc); - out: if (ret) { if (new_rpc) { diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 51c35ef8c70..3ef38fe84d4 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1771,8 +1771,7 @@ client_init_rpc (xlator_t *this) goto out; } - conf->rpc = rpc_clnt_new (&conf->rpc_conf, this->options, this->ctx, - this->name); + conf->rpc = rpc_clnt_new (this->options, this->ctx, this->name); if (!conf->rpc) goto out; |