This is an automated email from the ASF dual-hosted git repository.
shoothzj 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 ac7e9092ae clean code: remove unused gcExecutor (#3682)
ac7e9092ae is described below
commit ac7e9092aebe9fc7e7e16832ae3fc1d2bbd91fc4
Author: wenbingshen <[email protected]>
AuthorDate: Fri Dec 2 08:19:22 2022 +0800
clean code: remove unused gcExecutor (#3682)
---
.../bookkeeper/bookie/storage/ldb/DbLedgerStorage.java | 12 +++---------
.../bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java | 7 ++++---
.../bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java | 9 ++++-----
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java
index 7de36634fe..df071acb67 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorage.java
@@ -38,7 +38,6 @@ import java.util.List;
import java.util.PrimitiveIterator.OfLong;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.bookie.BookieException;
@@ -120,8 +119,6 @@ public class DbLedgerStorage implements LedgerStorage {
private int numberOfDirs;
private List<SingleDirectoryDbLedgerStorage> ledgerStorageList;
- // Keep 1 single Bookie GC thread so the compactions from multiple
individual directories are serialized
- private ScheduledExecutorService gcExecutor;
private ExecutorService entryLoggerWriteExecutor = null;
private ExecutorService entryLoggerFlushExecutor = null;
@@ -173,8 +170,6 @@ public class DbLedgerStorage implements LedgerStorage {
long perDirectoryReadCacheSize = readCacheMaxSize / numberOfDirs;
int readAheadCacheBatchSize = conf.getInt(READ_AHEAD_CACHE_BATCH_SIZE,
DEFAULT_READ_AHEAD_CACHE_BATCH_SIZE);
- gcExecutor = Executors.newSingleThreadScheduledExecutor(new
DefaultThreadFactory("GarbageCollector"));
-
ledgerStorageList = Lists.newArrayList();
for (int i = 0; i < ledgerDirsManager.getAllLedgerDirs().size(); i++) {
File ledgerDir = ledgerDirsManager.getAllLedgerDirs().get(i);
@@ -238,7 +233,7 @@ public class DbLedgerStorage implements LedgerStorage {
}
ledgerStorageList.add(newSingleDirectoryDbLedgerStorage(conf,
ledgerManager, ldm,
idm, entrylogger,
- statsLogger, gcExecutor, perDirectoryWriteCacheSize,
+ statsLogger, perDirectoryWriteCacheSize,
perDirectoryReadCacheSize,
readAheadCacheBatchSize));
ldm.getListeners().forEach(ledgerDirsManager::addLedgerDirsListener);
@@ -278,12 +273,11 @@ public class DbLedgerStorage implements LedgerStorage {
@VisibleForTesting
protected SingleDirectoryDbLedgerStorage
newSingleDirectoryDbLedgerStorage(ServerConfiguration conf,
LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager,
LedgerDirsManager indexDirsManager,
- EntryLogger entryLogger, StatsLogger statsLogger,
- ScheduledExecutorService gcExecutor, long writeCacheSize, long
readCacheSize,
+ EntryLogger entryLogger, StatsLogger statsLogger, long
writeCacheSize, long readCacheSize,
int readAheadCacheBatchSize)
throws IOException {
return new SingleDirectoryDbLedgerStorage(conf, ledgerManager,
ledgerDirsManager, indexDirsManager, entryLogger,
- statsLogger, allocator,
gcExecutor, writeCacheSize, readCacheSize,
+ statsLogger, allocator,
writeCacheSize, readCacheSize,
readAheadCacheBatchSize);
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
index 8b752b33ca..92011b55ab 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/SingleDirectoryDbLedgerStorage.java
@@ -144,9 +144,10 @@ public class SingleDirectoryDbLedgerStorage implements
CompactableLedgerStorage
private final Counter flushExecutorTime;
public SingleDirectoryDbLedgerStorage(ServerConfiguration conf,
LedgerManager ledgerManager,
- LedgerDirsManager ledgerDirsManager, LedgerDirsManager
indexDirsManager, EntryLogger entryLogger,
- StatsLogger statsLogger, ByteBufAllocator allocator,
ScheduledExecutorService gcExecutor,
- long writeCacheSize, long readCacheSize, int
readAheadCacheBatchSize) throws IOException {
+ LedgerDirsManager ledgerDirsManager,
LedgerDirsManager indexDirsManager,
+ EntryLogger entryLogger, StatsLogger
statsLogger, ByteBufAllocator allocator,
+ long writeCacheSize, long
readCacheSize, int readAheadCacheBatchSize)
+ throws IOException {
checkArgument(ledgerDirsManager.getAllLedgerDirs().size() == 1,
"Db implementation only allows for one storage dir");
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java
index 3e1d1a1f4d..717db8684d 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/storage/ldb/DbLedgerStorageWriteCacheTest.java
@@ -28,7 +28,6 @@ import io.netty.buffer.ByteBufAllocator;
import io.netty.buffer.Unpooled;
import java.io.File;
import java.io.IOException;
-import java.util.concurrent.ScheduledExecutorService;
import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.bookie.BookieException.OperationRejectedException;
import org.apache.bookkeeper.bookie.BookieImpl;
@@ -56,11 +55,11 @@ public class DbLedgerStorageWriteCacheTest {
@Override
protected SingleDirectoryDbLedgerStorage
newSingleDirectoryDbLedgerStorage(ServerConfiguration conf,
LedgerManager ledgerManager, LedgerDirsManager ledgerDirsManager,
LedgerDirsManager indexDirsManager,
- EntryLogger entryLogger, StatsLogger statsLogger,
ScheduledExecutorService gcExecutor,
+ EntryLogger entryLogger, StatsLogger statsLogger,
long writeCacheSize, long readCacheSize, int
readAheadCacheBatchSize)
throws IOException {
return new MockedSingleDirectoryDbLedgerStorage(conf,
ledgerManager, ledgerDirsManager, indexDirsManager,
- entryLogger, statsLogger, allocator, gcExecutor,
writeCacheSize,
+ entryLogger, statsLogger, allocator, writeCacheSize,
readCacheSize, readAheadCacheBatchSize);
}
@@ -68,10 +67,10 @@ public class DbLedgerStorageWriteCacheTest {
public MockedSingleDirectoryDbLedgerStorage(ServerConfiguration
conf, LedgerManager ledgerManager,
LedgerDirsManager ledgerDirsManager, LedgerDirsManager
indexDirsManager, EntryLogger entryLogger,
StatsLogger statsLogger,
- ByteBufAllocator allocator, ScheduledExecutorService
gcExecutor, long writeCacheSize,
+ ByteBufAllocator allocator, long writeCacheSize,
long readCacheSize, int readAheadCacheBatchSize) throws
IOException {
super(conf, ledgerManager, ledgerDirsManager,
indexDirsManager, entryLogger,
- statsLogger, allocator, gcExecutor, writeCacheSize,
readCacheSize, readAheadCacheBatchSize);
+ statsLogger, allocator, writeCacheSize, readCacheSize,
readAheadCacheBatchSize);
}
@Override
