protocol/client: make sure to send only genuine events up to parent

that way parent notify logic is fine.

also, remove 'xlator_notify()' call in code, instead use 'default_notify()'

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@gluster.com>

BUG: 2584 (Inode number changes on a directory when one of subvolumes is down in replicate)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2584

1 files changed, 18 insertions, 31 deletions

diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index b5c894fdc..bb658fd0c 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -375,24 +375,16 @@ unwind:
 int
 client_notify_parents_child_up (xlator_t *this)
 {
-        xlator_list_t          *parent = NULL;
-
-        /* As fuse is not 'parent' of any translator now, triggering its
-           CHILD_UP event is hacky in case client has only client protocol */
-        if (!this->parents && this->ctx && this->ctx->master) {
-                /* send notify to 'ctx->master' if it exists */
-                xlator_notify (this->ctx->master, GF_EVENT_CHILD_UP,
-                               this->graph);
-        } else {
+        clnt_conf_t *conf = NULL;
+        int          ret  = 0;
 
-                parent = this->parents;
-                while (parent) {
-                        xlator_notify (parent->xlator, GF_EVENT_CHILD_UP,
-                                       this);
-                        parent = parent->next;
-                }
-        }
+        conf = this->private;
+        ret = default_notify (this, GF_EVENT_CHILD_UP, NULL);
+        if (ret)
+                gf_log (this->name, GF_LOG_INFO,
+                        "notify of CHILD_UP failed");
 
+        conf->last_sent_event = GF_EVENT_CHILD_UP;
         return 0;
 }
 
@@ -809,7 +801,6 @@ client_setvolume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *m
         clnt_conf_t          *conf          = NULL;
         xlator_t             *this          = NULL;
         dict_t               *reply         = NULL;
-        xlator_list_t        *parent        = NULL;
         char                 *process_uuid  = NULL;
         char                 *remote_error  = NULL;
         char                 *remote_subvol = NULL;
@@ -875,13 +866,11 @@ client_setvolume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *m
                         remote_error ? remote_error : strerror (op_errno));
                 errno = op_errno;
                 if (op_errno == ESTALE) {
-                        parent = this->parents;
-                        while (parent) {
-                                xlator_notify (parent->xlator,
-                                               GF_EVENT_VOLFILE_MODIFIED,
-                                               this);
-                                parent = parent->next;
-                        }
+                        ret = default_notify (this, GF_EVENT_VOLFILE_MODIFIED, NULL);
+                        if (ret)
+                                gf_log (this->name, GF_LOG_INFO,
+                                        "notify of VOLFILE_MODIFIED failed");
+                        conf->last_sent_event = GF_EVENT_VOLFILE_MODIFIED;
                 }
                 goto out;
         }
@@ -938,13 +927,11 @@ out:
                  * tell the parents that i am all ok..
                  */
                 gf_log (this->name, GF_LOG_INFO, "sending CHILD_CONNECTING event");
-                parent = this->parents;
-                while (parent) {
-                        xlator_notify (parent->xlator,
-                                       GF_EVENT_CHILD_CONNECTING, this);
-                        parent = parent->next;
-                }
-
+                ret = default_notify (this, GF_EVENT_CHILD_CONNECTING, NULL);
+                if (ret)
+                        gf_log (this->name, GF_LOG_INFO,
+                                "notify of CHILD_CONNECTING failed");
+                conf->last_sent_event = GF_EVENT_CHILD_CONNECTING;
                 conf->connecting= 1;
         }