You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by eo...@apache.org on 2019/02/16 15:00:03 UTC
[bookkeeper] branch master updated: [BK-GC] Fix GC thread gets
blocked
This is an automated email from the ASF dual-hosted git repository.
eolivelli 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 d511f59 [BK-GC] Fix GC thread gets blocked
d511f59 is described below
commit d511f590c15dd86345719ba842bd373411c6da49
Author: Rajan Dhabalia <rd...@apache.org>
AuthorDate: Sat Feb 16 06:59:54 2019 -0800
[BK-GC] Fix GC thread gets blocked
### Motivation
It addresses below thread-stuck while performing gc in bookie.
```
Thread 3363: (state = BLOCKED)
- java.lang.Object.wait(long) bci=0 (Compiled frame; information may be imprecise)
- java.lang.Object.wait() bci=2, line=502 (Compiled frame)
- org.apache.bookkeeper.util.ZkUtils.getChildrenInSingleNode(org.apache.zookeeper.ZooKeeper, java.lang.String) bci=34, line=243 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator.getChildrenAt(java.lang.String) bci=8, line=165 (Compiled fr
ame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$LeafIterator.<init>(org.apache.bookkeeper.meta.LongHierarchic
alLedgerManager$LongHierarchicalLedgerRangeIterator, java.lang.String) bci=11, line=187 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$InnerIterator.advance() bci=137, line=261 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$InnerIterator.next() bci=28, line=281 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$InnerIterator.next() bci=4, line=278 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$InnerIterator.next() bci=4, line=278 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator$InnerIterator.next() bci=4, line=278 (Compiled frame)
- org.apache.bookkeeper.meta.LongHierarchicalLedgerManager$LongHierarchicalLedgerRangeIterator.next() bci=8, line=304 (Compiled frame)
- org.apache.bookkeeper.meta.HierarchicalLedgerManager$HierarchicalLedgerRangeIterator.next() bci=26, line=117 (Compiled frame)
- org.apache.bookkeeper.bookie.ScanAndCompareGarbageCollector.gc(org.apache.bookkeeper.bookie.GarbageCollector$GarbageCleaner) bci=195, line=168 (Compiled frame)
- org.apache.bookkeeper.bookie.GarbageCollectorThread.doGcLedgers() bci=8, line=393 (Compiled frame)
- org.apache.bookkeeper.bookie.GarbageCollectorThread.runWithFlags(boolean, boolean, boolean) bci=39, line=355 (Compiled frame)
- org.apache.bookkeeper.bookie.GarbageCollectorThread.safeRun() bci=28, line=333 (Compiled frame)
- org.apache.bookkeeper.common.util.SafeRunnable.run() bci=1, line=36 (Compiled frame)
- java.util.concurrent.Executors$RunnableAdapter.call() bci=4, line=511 (Compiled frame)
- java.util.concurrent.FutureTask.runAndReset() bci=47, line=308 (Compiled frame)
- java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$301(java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask) bci=1, line=180 (Compiled frame)
- java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run() bci=37, line=294 (Compiled frame)
- java.util.concurrent.ThreadPoolExecutor.runWorker(java.util.concurrent.ThreadPoolExecutor$Worker) bci=95, line=1142 (Compiled frame)
- java.util.concurrent.ThreadPoolExecutor$Worker.run() bci=5, line=617 (Interpreted frame)
- io.netty.util.concurrent.FastThreadLocalRunnable.run() bci=4, line=30 (Interpreted frame)
- java.lang.Thread.run() bci=11, line=748 (Interpreted frame)
```
### Changes
add time-out to zk operation to avoid GC thread blocking.
Reviewers: Enrico Olivelli <eo...@gmail.com>, Sijie Guo <si...@apache.org>
This closes #1937 from rdhabalia/gc_dead
---
.../bookie/ScanAndCompareGarbageCollector.java | 3 ++-
.../apache/bookkeeper/client/BookKeeperAdmin.java | 2 +-
.../apache/bookkeeper/meta/CleanupLedgerManager.java | 4 ++--
.../apache/bookkeeper/meta/FlatLedgerManager.java | 5 +++--
.../bookkeeper/meta/HierarchicalLedgerManager.java | 6 +++---
.../org/apache/bookkeeper/meta/LedgerManager.java | 5 ++++-
.../meta/LegacyHierarchicalLedgerManager.java | 11 ++++++++---
.../meta/LongHierarchicalLedgerManager.java | 11 +++++++----
.../bookkeeper/meta/MSLedgerManagerFactory.java | 2 +-
.../server/http/service/ListLedgerService.java | 2 +-
.../java/org/apache/bookkeeper/util/ZkUtils.java | 10 ++++++++--
.../org/apache/bookkeeper/bookie/CompactionTest.java | 2 +-
.../client/ParallelLedgerRecoveryTest.java | 4 ++--
.../org/apache/bookkeeper/meta/GcLedgersTest.java | 6 +++---
.../bookkeeper/meta/LedgerManagerIteratorTest.java | 20 ++++++++++----------
.../apache/bookkeeper/meta/MockLedgerManager.java | 2 +-
.../bookkeeper/metadata/etcd/EtcdLedgerManager.java | 2 +-
.../metadata/etcd/EtcdLedgerManagerTest.java | 2 +-
18 files changed, 59 insertions(+), 40 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
index 24c5c97..b1e7722 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
@@ -139,7 +139,8 @@ public class ScanAndCompareGarbageCollector implements GarbageCollector {
}
// Iterate over all the ledger on the metadata store
- LedgerRangeIterator ledgerRangeIterator = ledgerManager.getLedgerRanges();
+ long zkOpTimeout = this.conf.getZkTimeout() * 2;
+ LedgerRangeIterator ledgerRangeIterator = ledgerManager.getLedgerRanges(zkOpTimeout);
Set<Long> ledgersInMetadata = null;
long start;
long end = -1;
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
index 37b59d1..9303ffd 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/BookKeeperAdmin.java
@@ -1320,7 +1320,7 @@ public class BookKeeperAdmin implements AutoCloseable {
*/
public Iterable<Long> listLedgers()
throws IOException {
- final LedgerRangeIterator iterator = bkc.getLedgerManager().getLedgerRanges();
+ final LedgerRangeIterator iterator = bkc.getLedgerManager().getLedgerRanges(0);
return new Iterable<Long>() {
public Iterator<Long> iterator() {
return new Iterator<Long>() {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java
index 25c5aca..3c7ddc5 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/CleanupLedgerManager.java
@@ -210,13 +210,13 @@ public class CleanupLedgerManager implements LedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
closeLock.readLock().lock();
try {
if (closed) {
return new ClosedLedgerRangeIterator();
}
- return underlying.getLedgerRanges();
+ return underlying.getLedgerRanges(zkOpTimeoutSec);
} finally {
closeLock.readLock().unlock();
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
index 7ee2e22..8c7f05f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/FlatLedgerManager.java
@@ -89,7 +89,7 @@ class FlatLedgerManager extends AbstractZkLedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeOutSec) {
return new LedgerRangeIterator() {
// single iterator, can visit only one time
boolean nextCalled = false;
@@ -103,7 +103,8 @@ class FlatLedgerManager extends AbstractZkLedgerManager {
try {
zkActiveLedgers = ledgerListToSet(
- ZkUtils.getChildrenInSingleNode(zk, ledgerRootPath), ledgerRootPath);
+ ZkUtils.getChildrenInSingleNode(zk, ledgerRootPath, zkOpTimeOutSec),
+ ledgerRootPath);
nextRange = new LedgerRange(zkActiveLedgers);
} catch (KeeperException.NoNodeException e) {
throw new IOException("Path does not exist: " + ledgerRootPath, e);
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
index 946ed2a..079fcfa 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/HierarchicalLedgerManager.java
@@ -87,9 +87,9 @@ class HierarchicalLedgerManager extends AbstractHierarchicalLedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
- LedgerRangeIterator legacyLedgerRangeIterator = legacyLM.getLedgerRanges();
- LedgerRangeIterator longLedgerRangeIterator = longLM.getLedgerRanges();
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
+ LedgerRangeIterator legacyLedgerRangeIterator = legacyLM.getLedgerRanges(zkOpTimeoutSec);
+ LedgerRangeIterator longLedgerRangeIterator = longLM.getLedgerRanges(zkOpTimeoutSec);
return new HierarchicalLedgerRangeIterator(legacyLedgerRangeIterator, longLedgerRangeIterator);
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManager.java
index cc7630b..039ff7c 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LedgerManager.java
@@ -149,9 +149,12 @@ public interface LedgerManager extends Closeable {
/**
* Loop to scan a range of metadata from metadata storage.
*
+ * @param zkOpTimeOutSec
+ * Iterator considers timeout while fetching ledger-range from
+ * zk.
* @return will return a iterator of the Ranges
*/
- LedgerRangeIterator getLedgerRanges();
+ LedgerRangeIterator getLedgerRanges(long zkOpTimeOutSec);
/**
* Used to represent the Ledgers range returned from the
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
index 76ecc9d..1a63407 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LegacyHierarchicalLedgerManager.java
@@ -153,8 +153,8 @@ class LegacyHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
- return new LegacyHierarchicalLedgerRangeIterator();
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
+ return new LegacyHierarchicalLedgerRangeIterator(zkOpTimeoutSec);
}
/**
@@ -166,6 +166,11 @@ class LegacyHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager
private String curL1Nodes = "";
private boolean iteratorDone = false;
private LedgerRange nextRange = null;
+ private final long zkOpTimeoutSec;
+
+ public LegacyHierarchicalLedgerRangeIterator(long zkOpTimeoutSec) {
+ this.zkOpTimeoutSec = zkOpTimeoutSec;
+ }
/**
* Iterate next level1 znode.
@@ -261,7 +266,7 @@ class LegacyHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager
String nodePath = nodeBuilder.toString();
List<String> ledgerNodes = null;
try {
- ledgerNodes = ZkUtils.getChildrenInSingleNode(zk, nodePath);
+ ledgerNodes = ZkUtils.getChildrenInSingleNode(zk, nodePath, zkOpTimeoutSec);
} catch (KeeperException.NoNodeException e) {
/* If the node doesn't exist, we must have raced with a recursive node removal, just
* return an empty list. */
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
index 2e69e90..95f8e48 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/LongHierarchicalLedgerManager.java
@@ -139,8 +139,8 @@ class LongHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
- return new LongHierarchicalLedgerRangeIterator();
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
+ return new LongHierarchicalLedgerRangeIterator(zkOpTimeoutSec);
}
@@ -149,6 +149,7 @@ class LongHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager {
*/
private class LongHierarchicalLedgerRangeIterator implements LedgerRangeIterator {
LedgerRangeIterator rootIterator;
+ final long zkOpTimeoutSec;
/**
* Returns all children with path as a parent. If path is non-existent,
@@ -162,7 +163,7 @@ class LongHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager {
*/
List<String> getChildrenAt(String path) throws IOException {
try {
- List<String> children = ZkUtils.getChildrenInSingleNode(zk, path);
+ List<String> children = ZkUtils.getChildrenInSingleNode(zk, path, zkOpTimeoutSec);
Collections.sort(children);
return children;
} catch (KeeperException.NoNodeException e) {
@@ -284,7 +285,9 @@ class LongHierarchicalLedgerManager extends AbstractHierarchicalLedgerManager {
}
}
- private LongHierarchicalLedgerRangeIterator() {}
+ private LongHierarchicalLedgerRangeIterator(long zkOpTimeoutSec) {
+ this.zkOpTimeoutSec = zkOpTimeoutSec;
+ }
private void bootstrap() throws IOException {
if (rootIterator == null) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
index 0834147..266db3a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/MSLedgerManagerFactory.java
@@ -641,7 +641,7 @@ public class MSLedgerManagerFactory extends AbstractZkLedgerManagerFactory {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
return new MSLedgerRangeIterator();
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
index f553b64..1683fd4 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/server/http/service/ListLedgerService.java
@@ -90,7 +90,7 @@ public class ListLedgerService implements HttpEndpointService {
LedgerManagerFactory mFactory = bookieServer.getBookie().getLedgerManagerFactory();
LedgerManager manager = mFactory.newLedgerManager();
- LedgerManager.LedgerRangeIterator iter = manager.getLedgerRanges();
+ LedgerManager.LedgerRangeIterator iter = manager.getLedgerRanges(0);
// output <ledgerId: ledgerMetadata>
LinkedHashMap<String, String> output = Maps.newLinkedHashMap();
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ZkUtils.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ZkUtils.java
index 5ba4a85..23d0b42 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ZkUtils.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ZkUtils.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.bookkeeper.conf.AbstractConfiguration;
@@ -221,7 +222,7 @@ public class ZkUtils {
* @throws InterruptedException
* @throws IOException
*/
- public static List<String> getChildrenInSingleNode(final ZooKeeper zk, final String node)
+ public static List<String> getChildrenInSingleNode(final ZooKeeper zk, final String node, long timeOutSec)
throws InterruptedException, IOException, KeeperException.NoNodeException {
final GetChildrenCtx ctx = new GetChildrenCtx();
getChildrenInSingleNode(zk, node, new GenericCallback<List<String>>() {
@@ -240,7 +241,12 @@ public class ZkUtils {
synchronized (ctx) {
while (!ctx.done) {
- ctx.wait();
+ try {
+ ctx.wait(timeOutSec > 0 ? TimeUnit.SECONDS.toMillis(timeOutSec) : 0);
+ } catch (InterruptedException e) {
+ ctx.rc = Code.OPERATIONTIMEOUT.intValue();
+ ctx.done = true;
+ }
}
}
if (Code.NONODE.intValue() == ctx.rc) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
index 556556e..3d7d2c4 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CompactionTest.java
@@ -970,7 +970,7 @@ public abstract class CompactionTest extends BookKeeperClusterTestCase {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
final AtomicBoolean hasnext = new AtomicBoolean(true);
return new LedgerManager.LedgerRangeIterator() {
@Override
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
index ab966fb..e6c3c22 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/ParallelLedgerRecoveryTest.java
@@ -112,8 +112,8 @@ public class ParallelLedgerRecoveryTest extends BookKeeperClusterTestCase {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
- return lm.getLedgerRanges();
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
+ return lm.getLedgerRanges(zkOpTimeoutSec);
}
@Override
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java
index 933c117..abc6614 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/GcLedgersTest.java
@@ -316,7 +316,7 @@ public class GcLedgersTest extends LedgerManagerTestCase {
};
SortedSet<Long> scannedLedgers = new TreeSet<Long>();
- LedgerRangeIterator iterator = getLedgerManager().getLedgerRanges();
+ LedgerRangeIterator iterator = getLedgerManager().getLedgerRanges(0);
while (iterator.hasNext()) {
LedgerRange ledgerRange = iterator.next();
scannedLedgers.addAll(ledgerRange.getLedgers());
@@ -422,7 +422,7 @@ public class GcLedgersTest extends LedgerManagerTestCase {
LedgerManager mockLedgerManager = new CleanupLedgerManager(getLedgerManager()) {
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeout) {
return new LedgerRangeIterator() {
@Override
public LedgerRange next() throws IOException {
@@ -552,7 +552,7 @@ public class GcLedgersTest extends LedgerManagerTestCase {
public void validateLedgerRangeIterator(SortedSet<Long> createdLedgers) throws IOException {
SortedSet<Long> scannedLedgers = new TreeSet<Long>();
- LedgerRangeIterator iterator = getLedgerManager().getLedgerRanges();
+ LedgerRangeIterator iterator = getLedgerManager().getLedgerRanges(0);
while (iterator.hasNext()) {
LedgerRange ledgerRange = iterator.next();
scannedLedgers.addAll(ledgerRange.getLedgers());
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerIteratorTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerIteratorTest.java
index bdb2902..1593e4b 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerIteratorTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerIteratorTest.java
@@ -134,7 +134,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
@Test
public void testIterateNoLedgers() throws Exception {
LedgerManager lm = getLedgerManager();
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
if (lri.hasNext()) {
lri.next();
@@ -150,7 +150,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
long id = 2020202;
createLedger(lm, id);
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
Set<Long> lids = ledgerRangeToSet(lri);
assertEquals(lids.size(), 1);
@@ -169,7 +169,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
createLedger(lm, id);
}
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
Set<Long> returnedIds = ledgerRangeToSet(lri);
assertEquals(ids, returnedIds);
@@ -188,7 +188,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
ids.add(i);
}
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
Set<Long> returnedIds = ledgerRangeToSet(lri);
assertEquals(ids, returnedIds);
@@ -232,7 +232,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
}
Set<Long> found = new TreeSet<>();
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
while (lri.hasNext()) {
LedgerManager.LedgerRange lr = lri.next();
found.addAll(lr.getLedgers());
@@ -279,7 +279,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
path, "data".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
Set<Long> returnedIds = ledgerRangeToSet(lri);
assertEquals(ids, returnedIds);
@@ -287,7 +287,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
Set<Long> ledgersReadAsync = getLedgerIdsByUsingAsyncProcessLedgers(lm);
assertEquals("Comparing LedgersIds read asynchronously", ids, ledgersReadAsync);
- lri = lm.getLedgerRanges();
+ lri = lm.getLedgerRanges(0);
int emptyRanges = 0;
while (lri.hasNext()) {
if (lri.next().getLedgers().isEmpty()) {
@@ -329,7 +329,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
path, "data".getBytes(), ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
assertNotNull(lri);
Set<Long> returnedIds = ledgerRangeToSet(lri);
assertEquals(ids, returnedIds);
@@ -394,7 +394,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
latch.await();
while (MathUtils.elapsedNanos(start) < runtime) {
- LedgerRangeIterator lri = checkerLM.getLedgerRanges();
+ LedgerRangeIterator lri = checkerLM.getLedgerRanges(0);
Set<Long> returnedIds = ledgerRangeToSet(lri);
for (long id: mustExist) {
assertTrue(returnedIds.contains(id));
@@ -505,7 +505,7 @@ public class LedgerManagerIteratorTest extends LedgerManagerTestCase {
public void hierarchicalLedgerManagerAsyncProcessLedgersTest() throws Throwable {
Assume.assumeTrue(baseConf.getLedgerManagerFactoryClass().equals(HierarchicalLedgerManagerFactory.class));
LedgerManager lm = getLedgerManager();
- LedgerRangeIterator lri = lm.getLedgerRanges();
+ LedgerRangeIterator lri = lm.getLedgerRanges(0);
Set<Long> ledgerIds = new TreeSet<>(Arrays.asList(1234L, 123456789123456789L));
for (Long ledgerId : ledgerIds) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
index f5cbe3a..0f818b6 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/MockLedgerManager.java
@@ -188,7 +188,7 @@ public class MockLedgerManager implements LedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long zkOpTimeoutSec) {
return null;
}
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
index 4988a81..a40a4bc 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManager.java
@@ -420,7 +420,7 @@ class EtcdLedgerManager implements LedgerManager {
}
@Override
- public LedgerRangeIterator getLedgerRanges() {
+ public LedgerRangeIterator getLedgerRanges(long opTimeOutSec) {
KeyStream<Long> ks = new KeyStream<>(
kvClient,
ByteSequence.fromString(EtcdUtils.getLedgerKey(scope, 0L)),
diff --git a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
index 984224c..992d24f 100644
--- a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
+++ b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdLedgerManagerTest.java
@@ -225,7 +225,7 @@ public class EtcdLedgerManagerTest extends EtcdTestBase {
createNumLedgers(numLedgers);
long nextLedgerId = 0L;
- LedgerRangeIterator iter = lm.getLedgerRanges();
+ LedgerRangeIterator iter = lm.getLedgerRanges(0);
while (iter.hasNext()) {
LedgerRange lr = iter.next();
for (Long lid : lr.getLedgers()) {