diff options
Diffstat (limited to 'xlators/protocol/client/src')
-rw-r--r-- | xlators/protocol/client/src/client-callback.c | 52 | ||||
-rw-r--r-- | xlators/protocol/client/src/client-handshake.c | 30 | ||||
-rw-r--r-- | xlators/protocol/client/src/client-messages.h | 1 | ||||
-rw-r--r-- | xlators/protocol/client/src/client.c | 2 | ||||
-rw-r--r-- | xlators/protocol/client/src/client.h | 3 |
5 files changed, 77 insertions, 11 deletions
diff --git a/xlators/protocol/client/src/client-callback.c b/xlators/protocol/client/src/client-callback.c index 16f5441a778..7ee2113762a 100644 --- a/xlators/protocol/client/src/client-callback.c +++ b/xlators/protocol/client/src/client-callback.c @@ -81,13 +81,53 @@ out: return 0; } +int +client_cbk_child_up (struct rpc_clnt *rpc, void *mydata, void *data) +{ + clnt_conf_t *conf = NULL; + xlator_t *this = NULL; + + this = THIS; + GF_VALIDATE_OR_GOTO ("client", this, out); + GF_VALIDATE_OR_GOTO (this->name, rpc, out); + conf = this->private; + GF_VALIDATE_OR_GOTO (this->name, conf, out); + + gf_msg_debug (this->name, 0, "Received CHILD_UP"); + conf->child_up = _gf_true; + + this->notify (this, GF_EVENT_CHILD_UP, NULL); +out: + return 0; +} + +int +client_cbk_child_down (struct rpc_clnt *rpc, void *mydata, void *data) +{ + clnt_conf_t *conf = NULL; + xlator_t *this = NULL; + + this = THIS; + GF_VALIDATE_OR_GOTO ("client", this, out); + GF_VALIDATE_OR_GOTO (this->name, rpc, out); + conf = this->private; + GF_VALIDATE_OR_GOTO (this->name, conf, out); + + gf_msg_debug (this->name, 0, "Received CHILD_DOWN"); + conf->child_up = _gf_false; + + this->notify (this, GF_EVENT_CHILD_DOWN, NULL); +out: + return 0; +} + rpcclnt_cb_actor_t gluster_cbk_actors[GF_CBK_MAXVALUE] = { - [GF_CBK_NULL] = {"NULL", GF_CBK_NULL, client_cbk_null }, - [GF_CBK_FETCHSPEC] = {"FETCHSPEC", GF_CBK_FETCHSPEC, client_cbk_fetchspec }, - [GF_CBK_INO_FLUSH] = {"INO_FLUSH", GF_CBK_INO_FLUSH, client_cbk_ino_flush }, - [GF_CBK_CACHE_INVALIDATION] = {"CACHE_INVALIDATION", - GF_CBK_CACHE_INVALIDATION, - client_cbk_cache_invalidation }, + [GF_CBK_NULL] = {"NULL", GF_CBK_NULL, client_cbk_null }, + [GF_CBK_FETCHSPEC] = {"FETCHSPEC", GF_CBK_FETCHSPEC, client_cbk_fetchspec }, + [GF_CBK_INO_FLUSH] = {"INO_FLUSH", GF_CBK_INO_FLUSH, client_cbk_ino_flush }, + [GF_CBK_CACHE_INVALIDATION] = {"CACHE_INVALIDATION", GF_CBK_CACHE_INVALIDATION, client_cbk_cache_invalidation }, + [GF_CBK_CHILD_UP] = {"CHILD_UP", GF_CBK_CHILD_UP, client_cbk_child_up }, + [GF_CBK_CHILD_DOWN] = {"CHILD_DOWN", GF_CBK_CHILD_DOWN, client_cbk_child_down }, }; diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c index 3b170b8d186..5352e549abf 100644 --- a/xlators/protocol/client/src/client-handshake.c +++ b/xlators/protocol/client/src/client-handshake.c @@ -129,13 +129,26 @@ client_notify_parents_child_up (xlator_t *this) clnt_conf_t *conf = NULL; int ret = 0; + GF_VALIDATE_OR_GOTO("client", this, out); conf = this->private; - 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 " - "failed"); + GF_VALIDATE_OR_GOTO(this->name, conf, out); + + if (conf->child_up) { + 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 failed"); + goto out; + } + } else { + gf_msg (this->name, GF_LOG_INFO, 0, PC_MSG_CHILD_STATUS, + "Defering sending CHILD_UP message as the client " + "translators are not yet ready to serve."); + } +out: return 0; } @@ -1157,6 +1170,13 @@ client_setvolume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *m goto out; } + ret = dict_get_uint32 (reply, "child_up", &conf->child_up); + if (ret) { + gf_msg (this->name, GF_LOG_WARNING, 0, PC_MSG_DICT_GET_FAILED, + "failed to find key 'child_up' in the options"); + goto out; + } + ret = dict_get_uint32 (reply, "clnt-lk-version", &lk_ver); if (ret) { gf_msg (this->name, GF_LOG_WARNING, 0, PC_MSG_DICT_GET_FAILED, diff --git a/xlators/protocol/client/src/client-messages.h b/xlators/protocol/client/src/client-messages.h index 0fc9d31729c..a4b391b8331 100644 --- a/xlators/protocol/client/src/client-messages.h +++ b/xlators/protocol/client/src/client-messages.h @@ -617,6 +617,7 @@ * @recommendedaction * */ +#define PC_MSG_CHILD_STATUS (GLFS_PC_BASE + 64) /*------------*/ #define glfs_msg_end_x GLFS_MSGID_END, "Invalid: End of messages" diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 29fe44c4974..f1f58eb822e 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2467,6 +2467,8 @@ init (xlator_t *this) pthread_mutex_init (&conf->lock, NULL); INIT_LIST_HEAD (&conf->saved_fds); + conf->child_up = _gf_false; + /* Initialize parameters for lock self healing*/ conf->lk_version = 1; conf->grace_timer = NULL; diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h index 415fabbd7e1..a4d4d9f75a5 100644 --- a/xlators/protocol/client/src/client.h +++ b/xlators/protocol/client/src/client.h @@ -133,6 +133,9 @@ typedef struct clnt_conf { gf_boolean_t destroy; /* if enabled implies fini was called * on @this xlator instance */ + + gf_boolean_t child_up; /* Set to true, when child is up, and + * false, when child is down */ } clnt_conf_t; typedef struct _client_fd_ctx { |