diff options
author | Amar Tumballi <amar@gluster.com> | 2011-04-05 04:03:43 +0000 |
---|---|---|
committer | Vijay Bellur <vijay@gluster.com> | 2011-04-06 12:06:10 -0700 |
commit | 0b91f5be63813e6494283a8ac7d6e1e4348c9f13 (patch) | |
tree | 41d9ebad7b7c6cf692ee745406e3a06689aa175c /xlators/protocol/client/src/client.c | |
parent | f49597e4786babadf6124390fa13460f66970e8b (diff) |
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
Diffstat (limited to 'xlators/protocol/client/src/client.c')
-rw-r--r-- | xlators/protocol/client/src/client.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index 51c35ef8c..16ac4d212 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -1584,10 +1584,14 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, "handshake msg returned %d", ret); } else { //conf->rpc->connected = 1; - ret = default_notify (this, GF_EVENT_CHILD_UP, NULL); - if (ret) - gf_log (this->name, GF_LOG_DEBUG, - "default notify failed"); + if (conf->last_sent_event != GF_EVENT_CHILD_UP) { + ret = default_notify (this, GF_EVENT_CHILD_UP, + NULL); + if (ret) + gf_log (this->name, GF_LOG_DEBUG, + "default notify failed"); + conf->last_sent_event = GF_EVENT_CHILD_UP; + } } break; } @@ -1599,7 +1603,16 @@ client_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, if (conf->connected) gf_log (this->name, GF_LOG_NORMAL, "disconnected"); - default_notify (this, GF_EVENT_CHILD_DOWN, NULL); + + /* If the CHILD_DOWN event goes to parent xlator + multiple times, the logic of parent xlator notify + may get screwed up.. (eg. CHILD_MODIFIED event in + replicate), hence make sure events which are passed + to parent are genuine */ + if (conf->last_sent_event != GF_EVENT_CHILD_DOWN) { + default_notify (this, GF_EVENT_CHILD_DOWN, NULL); + conf->last_sent_event = GF_EVENT_CHILD_DOWN; + } } else { if (conf->connected) gf_log (this->name, GF_LOG_DEBUG, @@ -1648,6 +1661,7 @@ notify (xlator_t *this, int32_t event, void *data, ...) "got %d, calling default_notify ()", event); default_notify (this, event, data); + conf->last_sent_event = event; break; } @@ -2008,6 +2022,8 @@ init (xlator_t *this) LOCK_INIT (&conf->rec_lock); + conf->last_sent_event = -1; /* To start with we don't have any events */ + this->private = conf; /* If it returns -1, then its a failure, if it returns +1 we need @@ -2025,6 +2041,7 @@ init (xlator_t *this) goto out; } + ret = client_init_rpc (this); out: if (ret) |