This is an automated email from the ASF dual-hosted git repository.
lushiji 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 700d45f435 Replace LedgerStorageNotificationListener with existing
LedgerDeletionListener (#3736)
700d45f435 is described below
commit 700d45f43566f49299f70b7d2c64e05bfd05b25a
Author: wenbingshen <[email protected]>
AuthorDate: Wed Feb 8 15:15:54 2023 +0800
Replace LedgerStorageNotificationListener with existing
LedgerDeletionListener (#3736)
---
.../org/apache/bookkeeper/bookie/BookieImpl.java | 7 ++---
.../bookkeeper/bookie/GarbageCollectorThread.java | 6 ----
.../bookie/InterleavedLedgerStorage.java | 5 ----
.../apache/bookkeeper/bookie/LedgerStorage.java | 1 -
.../bookie/LedgerStorageNotificationListener.java | 35 ----------------------
.../bookkeeper/bookie/SortedLedgerStorage.java | 5 ----
.../bookie/storage/ldb/DbLedgerStorage.java | 6 ----
.../ldb/SingleDirectoryDbLedgerStorage.java | 6 ----
.../bookkeeper/bookie/MockLedgerStorage.java | 5 ----
.../apache/bookkeeper/bookie/SyncThreadTest.java | 5 ----
.../org/apache/bookkeeper/meta/GcLedgersTest.java | 6 ----
.../bookkeeper/meta/LedgerManagerTestCase.java | 6 ----
12 files changed, 3 insertions(+), 90 deletions(-)
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
index a3605418aa..c21c068535 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieImpl.java
@@ -376,7 +376,6 @@ public class BookieImpl extends BookieCriticalThread
implements Bookie {
}
});
ledgerStorage.setCheckpointer(Checkpointer.NULL);
-
ledgerStorage.setStorageStorageNotificationListener(LedgerStorageNotificationListener.NULL);
return ledgerStorage;
}
@@ -479,9 +478,9 @@ public class BookieImpl extends BookieCriticalThread
implements Bookie {
syncThread = new SyncThread(conf, getLedgerDirsListener(),
ledgerStorage, checkpointSource, statsLogger);
}
- LedgerStorageNotificationListener storageNotificationListener = new
LedgerStorageNotificationListener() {
+ LedgerStorage.LedgerDeletionListener ledgerDeletionListener = new
LedgerStorage.LedgerDeletionListener() {
@Override
- public void ledgerRemovedFromStorage(long ledgerId) {
+ public void ledgerDeleted(long ledgerId) {
masterKeyCache.remove(ledgerId);
}
};
@@ -489,7 +488,7 @@ public class BookieImpl extends BookieCriticalThread
implements Bookie {
ledgerStorage.setStateManager(stateManager);
ledgerStorage.setCheckpointSource(checkpointSource);
ledgerStorage.setCheckpointer(syncThread);
-
ledgerStorage.setStorageStorageNotificationListener(storageNotificationListener);
+ ledgerStorage.registerLedgerDeletionListener(ledgerDeletionListener);
handles = new HandleFactoryImpl(ledgerStorage);
// Expose Stats
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
index 31cd6cf290..d17450426e 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/GarbageCollectorThread.java
@@ -124,7 +124,6 @@ public class GarbageCollectorThread implements Runnable {
private static final AtomicLong threadNum = new AtomicLong(0);
final AbstractLogCompactor.Throttler throttler;
- private LedgerStorageNotificationListener storageNotificationListener =
LedgerStorageNotificationListener.NULL;
/**
* Create a garbage collector thread.
*
@@ -182,7 +181,6 @@ public class GarbageCollectorThread implements Runnable {
}
gcStats.getDeletedLedgerCounter().inc();
ledgerStorage.deleteLedger(ledgerId);
- storageNotificationListener.ledgerRemovedFromStorage(ledgerId);
} catch (IOException e) {
LOG.error("Exception when deleting the ledger index file on
the Bookie: ", e);
}
@@ -781,8 +779,4 @@ public class GarbageCollectorThread implements Runnable {
.minorCompactionCounter(gcStats.getMinorCompactionCounter().get())
.build();
}
-
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
- this.storageNotificationListener = storageNotificationListener;
- }
}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
index 26eefd2458..abc6d96213 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/InterleavedLedgerStorage.java
@@ -174,11 +174,6 @@ public class InterleavedLedgerStorage implements
CompactableLedgerStorage, Entry
this.checkpointer = checkpointer;
}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
-
this.gcThread.setStorageStorageNotificationListener(storageNotificationListener);
- }
-
public void initializeWithEntryLogger(ServerConfiguration conf,
LedgerManager ledgerManager,
LedgerDirsManager ledgerDirsManager,
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java
index 6b0b0fd37e..bedc7d2681 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorage.java
@@ -60,7 +60,6 @@ public interface LedgerStorage {
void setStateManager(StateManager stateManager);
void setCheckpointSource(CheckpointSource checkpointSource);
void setCheckpointer(Checkpointer checkpointer);
- void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
ledgerStorageNotificationListener);
/**
* Start any background threads belonging to the storage system. For
example, garbage collection.
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageNotificationListener.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageNotificationListener.java
deleted file mode 100644
index af2729dd16..0000000000
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerStorageNotificationListener.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.bookkeeper.bookie;
-
-/**
- * The instance that is responsible for checkpointing ledger storage.
- */
-public interface LedgerStorageNotificationListener {
-
- LedgerStorageNotificationListener NULL = new
LedgerStorageNotificationListener(){
- @Override
- public void ledgerRemovedFromStorage(long ledgerId) {
- // no-op
- }
- };
-
- void ledgerRemovedFromStorage(long ledgerId);
-}
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
index d7984b1c2e..01d14400f0 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/SortedLedgerStorage.java
@@ -118,11 +118,6 @@ public class SortedLedgerStorage
interleavedLedgerStorage.setCheckpointer(checkpointer);
}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
-
this.interleavedLedgerStorage.setStorageStorageNotificationListener(storageNotificationListener);
- }
-
@VisibleForTesting
ScheduledExecutorService getScheduler() {
return scheduler;
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 48e36d90d6..81eab673dd 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
@@ -50,7 +50,6 @@ import
org.apache.bookkeeper.bookie.LastAddConfirmedUpdateNotification;
import org.apache.bookkeeper.bookie.LedgerCache;
import org.apache.bookkeeper.bookie.LedgerDirsManager;
import org.apache.bookkeeper.bookie.LedgerStorage;
-import org.apache.bookkeeper.bookie.LedgerStorageNotificationListener;
import org.apache.bookkeeper.bookie.StateManager;
import org.apache.bookkeeper.bookie.storage.EntryLogIdsImpl;
import org.apache.bookkeeper.bookie.storage.EntryLogger;
@@ -294,11 +293,6 @@ public class DbLedgerStorage implements LedgerStorage {
ledgerStorageList.forEach(s -> s.setCheckpointer(checkpointer));
}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
- ledgerStorageList.forEach(s ->
s.setStorageStorageNotificationListener(storageNotificationListener));
- }
-
@Override
public void start() {
ledgerStorageList.forEach(LedgerStorage::start);
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 b91067d23d..0d18367dd7 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
@@ -64,7 +64,6 @@ import org.apache.bookkeeper.bookie.LedgerCache;
import org.apache.bookkeeper.bookie.LedgerDirsManager;
import org.apache.bookkeeper.bookie.LedgerDirsManager.LedgerDirsListener;
import org.apache.bookkeeper.bookie.LedgerEntryPage;
-import org.apache.bookkeeper.bookie.LedgerStorageNotificationListener;
import org.apache.bookkeeper.bookie.StateManager;
import org.apache.bookkeeper.bookie.storage.EntryLogger;
import
org.apache.bookkeeper.bookie.storage.ldb.DbLedgerStorageDataFormats.LedgerData;
@@ -241,11 +240,6 @@ public class SingleDirectoryDbLedgerStorage implements
CompactableLedgerStorage
@Override
public void setCheckpointer(Checkpointer checkpointer) { }
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
-
this.gcThread.setStorageStorageNotificationListener(storageNotificationListener);
- }
-
/**
* Evict all the ledger info object that were not used recently.
*/
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java
index 33e18e90cd..0b14c395a8 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/MockLedgerStorage.java
@@ -75,11 +75,6 @@ public class MockLedgerStorage implements
CompactableLedgerStorage {
@Override
public void setCheckpointer(Checkpointer checkpointer) {}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageNotificationListener) {
-
- }
-
@Override
public void start() {}
@Override
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java
index 5a3914c5c3..6df1bacb80 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/SyncThreadTest.java
@@ -285,11 +285,6 @@ public class SyncThreadTest {
@Override
public void setCheckpointer(Checkpointer checkpointer) {}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageListener) {
-
- }
-
@Override
public void deleteLedger(long ledgerId) throws IOException {
}
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 2f48a87609..fec74a8202 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
@@ -61,7 +61,6 @@ import org.apache.bookkeeper.bookie.EntryLocation;
import org.apache.bookkeeper.bookie.GarbageCollector;
import org.apache.bookkeeper.bookie.LastAddConfirmedUpdateNotification;
import org.apache.bookkeeper.bookie.LedgerDirsManager;
-import org.apache.bookkeeper.bookie.LedgerStorageNotificationListener;
import org.apache.bookkeeper.bookie.ScanAndCompareGarbageCollector;
import org.apache.bookkeeper.bookie.StateManager;
import org.apache.bookkeeper.client.BKException;
@@ -590,11 +589,6 @@ public class GcLedgersTest extends LedgerManagerTestCase {
@Override
public void setCheckpointer(Checkpointer checkpointer) {}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageListener) {
-
- }
-
@Override
public void start() {
}
diff --git
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java
index 799fe4badb..13272ab51c 100644
---
a/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java
+++
b/bookkeeper-server/src/test/java/org/apache/bookkeeper/meta/LedgerManagerTestCase.java
@@ -40,7 +40,6 @@ import org.apache.bookkeeper.bookie.CompactableLedgerStorage;
import org.apache.bookkeeper.bookie.EntryLocation;
import org.apache.bookkeeper.bookie.LastAddConfirmedUpdateNotification;
import org.apache.bookkeeper.bookie.LedgerDirsManager;
-import org.apache.bookkeeper.bookie.LedgerStorageNotificationListener;
import org.apache.bookkeeper.bookie.StateManager;
import org.apache.bookkeeper.common.util.OrderedScheduler;
import org.apache.bookkeeper.common.util.Watcher;
@@ -184,11 +183,6 @@ public abstract class LedgerManagerTestCase extends
BookKeeperClusterTestCase {
@Override
public void setCheckpointer(Checkpointer checkpointer) {}
- @Override
- public void
setStorageStorageNotificationListener(LedgerStorageNotificationListener
storageListener) {
-
- }
-
@Override
public void start() {
}
