Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auditor should get the LegdgerManagerFactory from the client instance #3011

Merged
merged 2 commits into from
Jan 26, 2022
+2 −6
Merged

Auditor should get the LegdgerManagerFactory from the client instance #3011

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03d0e56
Auditor should get the LegdgerManagerFactory from the client instance
merlimat Jan 26, 2022
51bcaf0
Removed unused import
merlimat Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/replication/Auditor.java
View file
Original file line number Diff line number Diff line change
@@ -89,7 +89,6 @@
import org.apache.bookkeeper.common.concurrent.FutureUtils;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.meta.AbstractZkLedgerManagerFactory;
import org.apache.bookkeeper.meta.LedgerManager;
import org.apache.bookkeeper.meta.LedgerManager.LedgerRange;
import org.apache.bookkeeper.meta.LedgerManager.LedgerRangeIterator;
@@ -480,10 +479,7 @@ public Thread newThread(Runnable r) {
private void initialize(ServerConfiguration conf, BookKeeper bkc)
throws UnavailableException {
try {
LedgerManagerFactory ledgerManagerFactory = AbstractZkLedgerManagerFactory
.newLedgerManagerFactory(
conf,
bkc.getMetadataClientDriver().getLayoutManager());
LedgerManagerFactory ledgerManagerFactory = bkc.getLedgerManagerFactory();
ledgerManager = ledgerManagerFactory.newLedgerManager();
this.bookieLedgerIndexer = new BookieLedgerIndexer(ledgerManager);

@@ -503,7 +499,7 @@ private void initialize(ServerConfiguration conf, BookKeeper bkc)
} catch (CompatibilityException ce) {
throw new UnavailableException(
"CompatibilityException while initializing Auditor", ce);
} catch (IOException | KeeperException ioe) {
} catch (KeeperException ioe) {
throw new UnavailableException(
"Exception while initializing Auditor", ioe);
} catch (InterruptedException ie) {