You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/06/10 10:29:34 UTC
svn commit: r1491372 - in /zookeeper/bookkeeper/branches/branch-4.2:
CHANGES.txt
bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
Author: ivank
Date: Mon Jun 10 08:29:33 2013
New Revision: 1491372
URL: http://svn.apache.org/r1491372
Log:
BOOKKEEPER-577: BookieFailureTest uses sync/wait()/notify() incorrectly (ivank)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1491372&r1=1491371&r2=1491372&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Mon Jun 10 08:29:33 2013
@@ -22,6 +22,8 @@ Release 4.2.2 - Unreleased
BOOKKEEPER-584: Data loss when ledger metadata is overwritten (sijie via ivank)
+ BOOKKEEPER-577: BookieFailureTest uses sync/wait()/notify() incorrectly (ivank)
+
hedwig-server:
BOOKKEEPER-579: TestSubAfterCloseSub was put in a wrong package (sijie via ivank)
Modified: zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java?rev=1491372&r1=1491371&r2=1491372&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieFailureTest.java Mon Jun 10 08:29:33 2013
@@ -168,7 +168,6 @@ public class BookieFailureTest extends M
entries.add(entry.array());
entriesSize.add(entry.array().length);
lh.asyncAddEntry(entry.array(), this, sync);
-
}
LOG.info("Wrote " + numEntriesToWrite + " and now going to fail bookie.");
@@ -202,11 +201,10 @@ public class BookieFailureTest extends M
lh.asyncReadEntries(0, numEntriesToWrite - 1, this, sync);
synchronized (sync) {
- while (sync.value == false) {
- sync.wait(10000);
- assertTrue("Haven't received entries", sync.value);
- assertFalse("Failure occurred during read", sync.failureOccurred);
- }
+ int i = 0;
+ sync.wait(10000);
+ assertFalse("Failure occurred during read", sync.failureOccurred);
+ assertTrue("Haven't received entries", sync.value);
}
LOG.debug("*** READ COMPLETE ***");