You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2012/09/10 09:03:23 UTC
svn commit: r1382664 - in /zookeeper/branches/branch-3.4: CHANGES.txt
src/c/src/zookeeper.c
Author: mahadev
Date: Mon Sep 10 07:03:23 2012
New Revision: 1382664
URL: http://svn.apache.org/viewvc?rev=1382664&view=rev
Log:
ZOOKEEPER-1494. C client: socket leak after receive timeout in zookeeper_interest() (Michi Mutsuzaki via mahadev)
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=1382664&r1=1382663&r2=1382664&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Sep 10 07:03:23 2012
@@ -108,6 +108,9 @@ BUGFIXES:
ZOOKEEPER-1501. Nagios plugin always returns OK when it cannot connect to
zookeeper. (Brian Sutherland via mahadev)
+ ZOOKEEPER-1494. C client: socket leak after receive timeout in
+ zookeeper_interest() (Michi Mutsuzaki via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA
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=1382664&r1=1382663&r2=1382664&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/c/src/zookeeper.c (original)
+++ zookeeper/branches/branch-3.4/src/c/src/zookeeper.c Mon Sep 10 07:03:23 2012
@@ -1637,12 +1637,14 @@ int zookeeper_interest(zhandle_t *zh, in
#else
errno = ETIMEDOUT;
#endif
- *fd=-1;
*interest=0;
*tv = get_timeval(0);
return api_epilog(zh,handle_socket_error_msg(zh,
__LINE__,ZOPERATIONTIMEOUT,
- "connection timed out (exceeded timeout by %dms)",-recv_to));
+ "connection to %s timed out (exceeded timeout by %dms)",
+ format_endpoint_info(&zh->addrs[zh->connect_index]),
+ -recv_to));
+
}
// We only allow 1/3 of our timeout time to expire before sending
// a PING