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 cdd3fa1 fix build
cdd3fa1 is described below
commit cdd3fa114ce9e41adb4dc82deb45ca69b04f8a3c
Author: Enrico Olivelli <[email protected]>
AuthorDate: Thu Dec 12 15:52:29 2019 +0100
fix build
---
.../metadata/etcd/EtcdRegistrationTest.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git
a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdRegistrationTest.java
b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdRegistrationTest.java
index f36a496..0581a2c 100644
---
a/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdRegistrationTest.java
+++
b/metadata-drivers/etcd/src/test/java/org/apache/bookkeeper/metadata/etcd/EtcdRegistrationTest.java
@@ -42,6 +42,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.bookie.BookieException;
import org.apache.bookkeeper.bookie.BookieException.MetadataStoreException;
import org.apache.bookkeeper.common.concurrent.FutureUtils;
+import org.apache.bookkeeper.discover.BookieServiceInfo;
import org.apache.bookkeeper.discover.RegistrationClient;
import org.apache.bookkeeper.discover.RegistrationClient.RegistrationListener;
import org.apache.bookkeeper.metadata.etcd.testing.EtcdTestBase;
@@ -218,7 +219,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
Client client = newEtcdClient();
EtcdRegistrationManager regMgr = new
EtcdRegistrationManager(client, scope, ttlSeconds);
bookies.add(regMgr);
- regMgr.registerBookie(newBookie(i), readonly);
+ regMgr.registerBookie(newBookie(i), readonly,
BookieServiceInfo.EMPTY);
}
return bookies;
}
@@ -237,7 +238,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
try (EtcdRegistrationManager regManager = new EtcdRegistrationManager(
newEtcdClient(), scope, ttlSeconds)
) {
- regManager.registerBookie(bookieId, false);
+ regManager.registerBookie(bookieId, false,
BookieServiceInfo.EMPTY);
leaseId = regManager.getBkRegister().getLeaseId();
log.info("Registered bookie under scope '{}' with lease = {}",
scope, leaseId);
}
@@ -246,7 +247,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
try (EtcdRegistrationManager regManager = new EtcdRegistrationManager(
newEtcdClient(), scope, 100000 * ttlSeconds)
) {
- regManager.registerBookie(bookieId, false);
+ regManager.registerBookie(bookieId, false,
BookieServiceInfo.EMPTY);
leaseId = regManager.getBkRegister().getLeaseId();
log.info("Registered bookie under scope '{}' with new lease = {}",
scope, leaseId);
}
@@ -261,7 +262,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
try (EtcdRegistrationManager regManager = new EtcdRegistrationManager(
newEtcdClient(), scope, 10000000 * ttlSeconds)
) {
- regManager.registerBookie(bookieId, false);
+ regManager.registerBookie(bookieId, false,
BookieServiceInfo.EMPTY);
leaseId = regManager.getBkRegister().getLeaseId();
log.info("Registered bookie under scope '{}' with lease = {}",
scope, leaseId);
}
@@ -269,7 +270,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
try (EtcdRegistrationManager regManager = new EtcdRegistrationManager(
newEtcdClient(), scope, ttlSeconds)
) {
- regManager.registerBookie(bookieId, false);
+ regManager.registerBookie(bookieId, false,
BookieServiceInfo.EMPTY);
fail("Should fail to register bookie under scope '{}'"
+ " since previous registration has not been expired yet");
} catch (MetadataStoreException mse) {
@@ -295,14 +296,14 @@ public class EtcdRegistrationTest extends EtcdTestBase {
try (EtcdRegistrationManager regManager = new EtcdRegistrationManager(
newEtcdClient(), scope, 10000000 * ttlSeconds)
) {
- regManager.registerBookie(bookieId, readonly);
+ regManager.registerBookie(bookieId, readonly,
BookieServiceInfo.EMPTY);
leaseId = regManager.getBkRegister().getLeaseId();
log.info("Registered bookie under scope '{}' with lease = {}",
scope, leaseId);
log.info("Trying to register using same lease '{}'", leaseId);
try (EtcdRegistrationManager regManager2 = new
EtcdRegistrationManager(
regManager.getClient(), scope, regManager.getBkRegister()
)) {
- regManager.registerBookie(bookieId, readonly);
+ regManager.registerBookie(bookieId, readonly,
BookieServiceInfo.EMPTY);
}
}
}
@@ -341,7 +342,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
log.info("before registration : bookies = {}", bookies);
assertEquals(0, bookies.size());
// registered
- regMgr.registerBookie(bookieId, readonly);
+ regMgr.registerBookie(bookieId, readonly, BookieServiceInfo.EMPTY);
bookies = getBookies(readonly);
log.info("after registered: bookies = {}", bookies);
assertEquals(1, bookies.size());
@@ -388,7 +389,7 @@ public class EtcdRegistrationTest extends EtcdTestBase {
)) {
try {
startBarrier.await();
- regMgr.registerBookie(bookieId, readonly);
+ regMgr.registerBookie(bookieId, readonly,
BookieServiceInfo.EMPTY);
numSuccesses.incrementAndGet();
} catch (InterruptedException e) {
log.warn("Interrupted at waiting for the other threads
to start", e);
