diff options
Diffstat (limited to 'xlators/protocol/server/src/server.c')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 7ac8590a42e..b75ad172e6f 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -42,6 +42,7 @@ grace_time_handler (void *data) server_connection_t *conn = NULL; xlator_t *this = NULL; gf_boolean_t cancelled = _gf_false; + gf_boolean_t detached = _gf_false; conn = data; this = conn->this; @@ -49,11 +50,15 @@ grace_time_handler (void *data) GF_VALIDATE_OR_GOTO (THIS->name, conn, out); GF_VALIDATE_OR_GOTO (THIS->name, this, out); - gf_log (this->name, GF_LOG_INFO, "grace timer expired"); + gf_log (this->name, GF_LOG_INFO, "grace timer expired for %s", conn->id); cancelled = server_cancel_conn_timer (this, conn); if (cancelled) { - server_connection_cleanup (this, conn); + //conn should not be destroyed in conn_put, so take a ref. + server_conn_ref (conn); + server_connection_put (this, conn, &detached); + if (detached)//reconnection did not happen :-( + server_connection_cleanup (this, conn); server_conn_unref (conn); } out: |