This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 38a3885 AuditorLedgerCheckerTest: wait for ro transition to make more
reliable
38a3885 is described below
commit 38a3885a363971635fc2e45ec48d3331a16b8c63
Author: Andrey Yegorov <[email protected]>
AuthorDate: Wed Jan 24 10:54:55 2018 -0800
AuditorLedgerCheckerTest: wait for ro transition to make more reliable
(bug W-2999244)
Signed-off-by: Andrey Yegorov <ayegorovsalesforce.com>
[Reworked for master]
Signed-off-by: Samuel Just <sjustsalesforce.com>
Author: Andrey Yegorov <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>, Sijie Guo
<[email protected]>
This closes #1038 from athanatos/forupstream/tests/bookietransition
---
.../apache/bookkeeper/replication/AuditorLedgerCheckerTest.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
index b3ea6a8..bb56e77 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorLedgerCheckerTest.java
@@ -42,6 +42,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.client.AsyncCallback.AddCallback;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
@@ -294,10 +295,12 @@ public class AuditorLedgerCheckerTest extends
BookKeeperClusterTestCase {
int count = ledgerList.size();
final CountDownLatch underReplicaLatch =
registerUrLedgerWatcher(count);
- ServerConfiguration bookieConf = bsConfs.get(2);
- BookieServer bk = bs.get(2);
+ final int bkIndex = 2;
+ ServerConfiguration bookieConf = bsConfs.get(bkIndex);
+ BookieServer bk = bs.get(bkIndex);
bookieConf.setReadOnlyModeEnabled(true);
bk.getBookie().getStateManager().doTransitionToReadOnlyMode();
+
bkc.waitForReadOnlyBookie(Bookie.getBookieAddress(bsConfs.get(bkIndex))).get(30,
TimeUnit.SECONDS);
// grace period for publishing the bk-ledger
LOG.debug("Waiting for Auditor to finish ledger check.");
@@ -324,6 +327,7 @@ public class AuditorLedgerCheckerTest extends
BookKeeperClusterTestCase {
BookieServer bk = bs.get(bkIndex);
bookieConf.setReadOnlyModeEnabled(true);
bk.getBookie().getStateManager().doTransitionToReadOnlyMode();
+
bkc.waitForReadOnlyBookie(Bookie.getBookieAddress(bsConfs.get(bkIndex))).get(30,
TimeUnit.SECONDS);
// grace period for publishing the bk-ledger
LOG.debug("Waiting for Auditor to finish ledger check.");
--
To stop receiving notification emails like this one, please contact
[email protected].
