summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/client
diff options
context:
space:
mode:
authorAnoop C S <anoopcs@redhat.com>2015-09-12 19:48:06 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-09-28 04:57:54 -0700
commit5be6f0339b5ad189868a50b837ae7b8c164a5b25 (patch)
tree6451476f09626a99cf03e7d04a4e03722d01259d /xlators/protocol/client
parent007bfd963240d7cf80b4f1b5f652cf142bcadb65 (diff)
protocol/client: Remove dead code from client_rpc_notify
Normally GF_EVENT_CHILD_UP is dispatched after client handshake. But we have some dead code in client_rpc_notify which is assumed to do the same on receiving RPC_CLNT_CONNECT. This dispatch is based on a condition whether "disable-handshake" is enabled or not. Since we require client-handshake everytime we have a connect this check for "disable-handshake" is invalid and no longer required. Moreover this option is never handled in any of the translators. Change-Id: Ic862d6ac08cd3b18cf231f50140cd00e84e52ca0 BUG: 1227667 Signed-off-by: Anoop C S <anoopcs@redhat.com> Reviewed-on: http://review.gluster.org/12170 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/protocol/client')
-rw-r--r--xlators/protocol/client/src/client-handshake.c2
-rw-r--r--xlators/protocol/client/src/client.c25
-rw-r--r--xlators/protocol/client/src/client.h2
3 files changed, 9 insertions, 20 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 9289859..3b170b8 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -130,7 +130,7 @@ client_notify_parents_child_up (xlator_t *this)
int ret = 0;
conf = this->private;
- ret = client_notify_dispatch (this, GF_EVENT_CHILD_UP, NULL);
+ ret = client_notify_dispatch_uniq (this, GF_EVENT_CHILD_UP, NULL);
if (ret)
gf_msg (this->name, GF_LOG_INFO, 0,
PC_MSG_CHILD_UP_NOTIFY_FAILED, "notify of CHILD_UP "
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 4ce210b..dc3b75d 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -50,7 +50,7 @@ out:
return 0;
}
-static int
+int
client_notify_dispatch_uniq (xlator_t *this, int32_t event, void *data, ...)
{
clnt_conf_t *conf = this->private;
@@ -1981,27 +1981,14 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event,
{
conf->connected = 1;
// connect happened, send 'get_supported_versions' mop
- ret = dict_get_str (this->options, "disable-handshake",
- &handshake);
gf_msg_debug (this->name, 0, "got RPC_CLNT_CONNECT");
- if ((ret < 0) || (strcasecmp (handshake, "on"))) {
- ret = client_handshake (this, rpc);
- if (ret)
- gf_msg (this->name, GF_LOG_WARNING, 0,
- PC_MSG_HANDSHAKE_RETURN, "handshake "
- "msg returned %d", ret);
- } else {
- //conf->rpc->connected = 1;
- ret = client_notify_dispatch_uniq (this,
- GF_EVENT_CHILD_UP,
- NULL);
- if (ret)
- gf_msg (this->name, GF_LOG_INFO, 0,
- PC_MSG_CHILD_UP_NOTIFY_FAILED,
- "CHILD_UP notify failed");
- }
+ ret = client_handshake (this, rpc);
+ if (ret)
+ gf_msg (this->name, GF_LOG_WARNING, 0,
+ PC_MSG_HANDSHAKE_RETURN, "handshake "
+ "msg returned %d", ret);
/* Cancel grace timer if set */
pthread_mutex_lock (&conf->lock);
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
index 55f9525..5a01244 100644
--- a/xlators/protocol/client/src/client.h
+++ b/xlators/protocol/client/src/client.h
@@ -270,4 +270,6 @@ gf_boolean_t
__is_fd_reopen_in_progress (clnt_fd_ctx_t *fdctx);
int
client_notify_dispatch (xlator_t *this, int32_t event, void *data, ...);
+int
+client_notify_dispatch_uniq (xlator_t *this, int32_t event, void *data, ...);
#endif /* !_CLIENT_H */