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 2014/03/26 22:13:46 UTC
svn commit: r1582055 - in /zookeeper/trunk: CHANGES.txt
src/java/test/org/apache/zookeeper/TestableZooKeeper.java
src/java/test/org/apache/zookeeper/test/WatcherTest.java
Author: michim
Date: Wed Mar 26 21:13:46 2014
New Revision: 1582055
URL: http://svn.apache.org/r1582055
Log:
ZOOKEEPER-1904. WatcherTest#testWatchAutoResetWithPending is failing (Rakesh R via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/test/org/apache/zookeeper/TestableZooKeeper.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1582055&r1=1582054&r2=1582055&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Mar 26 21:13:46 2014
@@ -585,6 +585,9 @@ BUGFIXES:
ZOOKEEPER-1263. fix handling of min/max session timeout value initialization
(Rakesh R via michim)
+ ZOOKEEPER-1904. WatcherTest#testWatchAutoResetWithPending is failing
+ (Rakesh R via michim)
+
IMPROVEMENTS:
ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/TestableZooKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/TestableZooKeeper.java?rev=1582055&r1=1582054&r2=1582055&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/TestableZooKeeper.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/TestableZooKeeper.java Wed Mar 26 21:13:46 2014
@@ -21,6 +21,8 @@ package org.apache.zookeeper;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.jute.Record;
import org.apache.zookeeper.proto.ReplyHeader;
@@ -64,8 +66,10 @@ public class TestableZooKeeper extends Z
* Cause this ZooKeeper object to stop receiving from the ZooKeeperServer
* for the given number of milliseconds.
* @param ms the number of milliseconds to pause.
+ * @return true if the connection is paused, otherwise false
*/
- public void pauseCnxn(final long ms) {
+ public boolean pauseCnxn(final long ms) {
+ final CountDownLatch initiatedPause = new CountDownLatch(1);
new Thread() {
public void run() {
synchronized(cnxn) {
@@ -74,6 +78,8 @@ public class TestableZooKeeper extends Z
cnxn.sendThread.testableCloseSocket();
} catch (IOException e) {
e.printStackTrace();
+ } finally {
+ initiatedPause.countDown();
}
Thread.sleep(ms);
} catch (InterruptedException e) {
@@ -81,6 +87,13 @@ public class TestableZooKeeper extends Z
}
}
}.start();
+
+ try {
+ return initiatedPause.await(ms, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ return false;
+ }
}
public boolean testableWaitForShutdown(int wait)
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java?rev=1582055&r1=1582054&r2=1582055&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java Wed Mar 26 21:13:46 2014
@@ -194,8 +194,7 @@ public class WatcherTest extends ClientB
zk.exists("/test", watches[i], cbs[i], count);
}
zk.exists("/test", false);
- zk.pauseCnxn(3000);
- Thread.sleep(50);
+ Assert.assertTrue("Failed to pause the connection!", zk.pauseCnxn(3000));
zk2.close();
stopServer();
watches[0].waitForDisconnected(60000);