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/12/12 15:06:35 UTC
[bookkeeper] branch fix/endpoint-discovery-impl updated: Fix other
build errors
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch fix/endpoint-discovery-impl
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/fix/endpoint-discovery-impl by this push:
new 27fc238 Fix other build errors
27fc238 is described below
commit 27fc238bc19750ea232ee3dee76df2517213dda0
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Thu Dec 12 16:06:23 2019 +0100
Fix other build errors
---
.../java/org/apache/bookkeeper/bookie/BookieStateManager.java | 6 ++++--
.../apache/bookkeeper/bookie/BookieInitializationTest.java | 4 +++-
.../replication/AuditorPlacementPolicyCheckTest.java | 11 ++++++-----
.../bookkeeper/replication/AuditorReplicasCheckTest.java | 3 ++-
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
index 54d6993..56f513f 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieStateManager.java
@@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Supplier;
import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.meta.MetadataBookieDriver;
import org.apache.bookkeeper.stats.Gauge;
@@ -61,6 +62,7 @@ import org.slf4j.LoggerFactory;
public class BookieStateManager implements StateManager {
private static final Logger LOG = LoggerFactory.getLogger(BookieStateManager.class);
private final ServerConfiguration conf;
+ private final BookieServiceInfo bookieServiceInfo = BookieServiceInfo.EMPTY;
private final List<File> statusDirs;
// use an executor to execute the state changes task
@@ -263,7 +265,7 @@ public class BookieStateManager implements StateManager {
rmRegistered.set(false);
try {
- rm.get().registerBookie(bookieId, isReadOnly);
+ rm.get().registerBookie(bookieId, isReadOnly, bookieServiceInfo);
rmRegistered.set(true);
} catch (BookieException e) {
throw new IOException(e);
@@ -333,7 +335,7 @@ public class BookieStateManager implements StateManager {
return;
}
try {
- rm.get().registerBookie(bookieId, true);
+ rm.get().registerBookie(bookieId, true, bookieServiceInfo);
} catch (BookieException e) {
LOG.error("Error in transition to ReadOnly Mode."
+ " Shutting down", e);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
index 628b561..cfc070a 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
@@ -82,6 +82,7 @@ import org.apache.bookkeeper.common.component.LifecycleComponent;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.conf.TestBKConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.http.HttpRouter;
import org.apache.bookkeeper.http.HttpServerLoader;
@@ -112,6 +113,7 @@ import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
+import static org.mockito.ArgumentMatchers.any;
import org.powermock.reflect.Whitebox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -288,7 +290,7 @@ public class BookieInitializationTest extends BookKeeperClusterTestCase {
RegistrationManager rm = mock(RegistrationManager.class);
doThrow(new MetadataStoreException("mocked exception"))
.when(rm)
- .registerBookie(anyString(), anyBoolean());
+ .registerBookie(anyString(), anyBoolean(), any(BookieServiceInfo.class));
// simulating ZooKeeper exception by assigning a closed zk client to bk
BookieServer bkServer = new BookieServer(conf) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java
index 468a032..75a7b16 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java
@@ -42,6 +42,7 @@ import org.apache.bookkeeper.client.api.DigestType;
import org.apache.bookkeeper.client.api.LedgerMetadata;
import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.meta.LedgerManager;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
@@ -108,7 +109,7 @@ public class AuditorPlacementPolicyCheckTest extends BookKeeperClusterTestCase {
bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
StaticDNSResolver.addNodeToRack(bookieAddress.getHostName(), "/rack" + (i));
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
}
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
@@ -217,7 +218,7 @@ public class AuditorPlacementPolicyCheckTest extends BookKeeperClusterTestCase {
for (int i = 0; i < numOfBookies; i++) {
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
}
// only three racks
@@ -312,7 +313,7 @@ public class AuditorPlacementPolicyCheckTest extends BookKeeperClusterTestCase {
for (int i = 0; i < numOfBookies; i++) {
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
}
LedgerManagerFactory mFactory = driver.getLedgerManagerFactory();
@@ -428,7 +429,7 @@ public class AuditorPlacementPolicyCheckTest extends BookKeeperClusterTestCase {
for (int i = 0; i < numOfBookies; i++) {
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
}
// only three racks
@@ -534,7 +535,7 @@ public class AuditorPlacementPolicyCheckTest extends BookKeeperClusterTestCase {
for (int i = 0; i < numOfBookies; i++) {
BookieSocketAddress bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
String zone = "/zone" + (i % 3);
String upgradeDomain = "/ud" + (i % 2);
String networkLocation = zone + upgradeDomain;
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorReplicasCheckTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorReplicasCheckTest.java
index a2d5f6b..85b2015 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorReplicasCheckTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorReplicasCheckTest.java
@@ -45,6 +45,7 @@ import org.apache.bookkeeper.client.LedgerMetadataBuilder;
import org.apache.bookkeeper.client.api.DigestType;
import org.apache.bookkeeper.client.api.LedgerMetadata;
import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.discover.RegistrationManager;
import org.apache.bookkeeper.meta.LedgerManager;
import org.apache.bookkeeper.meta.LedgerManagerFactory;
@@ -185,7 +186,7 @@ public class AuditorReplicasCheckTest extends BookKeeperClusterTestCase {
for (int i = 0; i < numOfBookies; i++) {
bookieAddress = new BookieSocketAddress("98.98.98." + i, 2181);
bookieAddresses.add(bookieAddress);
- regManager.registerBookie(bookieAddress.toString(), false);
+ regManager.registerBookie(bookieAddress.toString(), false, BookieServiceInfo.EMPTY);
}
return bookieAddresses;
}