You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2012/09/16 23:35:37 UTC
svn commit: r1385380 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/c/src/zookeeper.c
Author: michim
Date: Sun Sep 16 21:35:36 2012
New Revision: 1385380
URL: http://svn.apache.org/viewvc?rev=1385380&view=rev
Log:
Revert r1380932: ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP
request to server (lincoln.lee via michim)
Modified:
zookeeper/branches/branch-3.4/CHANGES.txt
zookeeper/branches/branch-3.4/src/c/src/zookeeper.c
Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1385380&r1=1385379&r2=1385380&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sun Sep 16 21:35:36 2012
@@ -99,9 +99,6 @@ BUGFIXES:
ZOOKEEPER-1481 allow the C cli to run exists with a watcher (phunt via michim)
- ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP request to server
- (lincoln.lee via michim)
-
ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from
the watch list. (Botond Hejj via mahadev)
Modified: zookeeper/branches/branch-3.4/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/c/src/zookeeper.c?rev=1385380&r1=1385379&r2=1385380&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/src/zookeeper.c (original)
+++ zookeeper/branches/branch-3.4/src/c/src/zookeeper.c Sun Sep 16 21:35:36 2012
@@ -2517,22 +2517,6 @@ int zookeeper_close(zhandle_t *zh)
/* make sure the close request is sent; we set timeout to an arbitrary
* (but reasonable) number of milliseconds since we want the call to block*/
rc=adaptor_send_queue(zh, 3000);
-
- /* make sure server has read the close request and sent back a response*/
- struct pollfd fd_s[1];
- fd_s[0].fd = zh->fd;
- fd_s[0].events = POLLIN;
- int ret = poll(fd_s, 1, 1000);
- if (ret == 0) {
- LOG_WARN(("Timeout when waitting for server's reply after sending a close request, sessionId=%#llx\n",
- zh->client_id.client_id));
- } else if (ret < 0) {
- LOG_WARN(("System error happens when waitting for server's reply, sessionId=%#llx\n",
- zh->client_id.client_id));
- } else {
- // do nothing
- }
-
}else{
LOG_INFO(("Freeing zookeeper resources for sessionId=%#llx\n",
zh->client_id.client_id));