You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by yo...@apache.org on 2023/02/21 06:33:41 UTC
[bookkeeper] branch branch-4.15 updated (d93069d418 -> b36ebeddd1)
This is an automated email from the ASF dual-hosted git repository.
yong pushed a change to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
from d93069d418 Revert "Speed up the rebuildinding of RocksDB index (#3458)"
new 73db961fc1 New ensemble choose different rack first. (#3721)
new b36ebeddd1 Fix RegionAwareEnsemblePlacementPolicy.newEnsemble sometimes failed problem. (#3725)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../RackawareEnsemblePlacementPolicyImpl.java | 23 ++-
.../ZoneawareEnsemblePlacementPolicyImpl.java | 2 +-
.../apache/bookkeeper/net/NetworkTopologyImpl.java | 7 +-
.../TestRackawareEnsemblePlacementPolicy.java | 172 ++++++++++++++++++++-
.../TestRegionAwareEnsemblePlacementPolicy.java | 119 ++++++++++++++
5 files changed, 313 insertions(+), 10 deletions(-)
[bookkeeper] 01/02: New ensemble choose different rack first. (#3721)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yong pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit 73db961fc17c5546b615671a9a5358d7f2e90d3a
Author: Yan Zhao <ho...@apache.org>
AuthorDate: Fri Feb 17 10:12:49 2023 +0800
New ensemble choose different rack first. (#3721)
Descriptions of the changes in this PR:
Fixes #3720
### Motivation
When new ensemble, choose the different rack node first, if there are no more different rack nodes, step down to pick nodes randomly.
(cherry picked from commit 7f8c31bdad3bf7261e795feafd7f969f871baa82)
---
.../RackawareEnsemblePlacementPolicyImpl.java | 24 ++++++---
.../TestRackawareEnsemblePlacementPolicy.java | 48 +++++++++++++++++-
.../TestRegionAwareEnsemblePlacementPolicy.java | 58 ++++++++++++++++++++++
3 files changed, 123 insertions(+), 7 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index c841044a03..49b14da7f7 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -413,9 +413,9 @@ public class RackawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
}
return PlacementResult.of(addrs, PlacementPolicyAdherence.FAIL);
}
-
+ //Choose different rack nodes.
+ String curRack = null;
for (int i = 0; i < ensembleSize; i++) {
- String curRack;
if (null == prevNode) {
if ((null == localNode) || defaultRack.equals(localNode.getNetworkLocation())) {
curRack = NodeBase.ROOT;
@@ -423,11 +423,23 @@ public class RackawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
curRack = localNode.getNetworkLocation();
}
} else {
- curRack = "~" + prevNode.getNetworkLocation();
+ if (!curRack.startsWith("~")) {
+ curRack = "~" + prevNode.getNetworkLocation();
+ } else {
+ curRack = curRack + NetworkTopologyImpl.NODE_SEPARATOR + prevNode.getNetworkLocation();
+ }
+ }
+ try {
+ prevNode = selectRandomFromRack(curRack, excludeNodes, ensemble, ensemble);
+ } catch (BKNotEnoughBookiesException e) {
+ if (!curRack.equals(NodeBase.ROOT)) {
+ curRack = NodeBase.ROOT;
+ prevNode = selectFromNetworkLocation(curRack, excludeNodes, ensemble, ensemble,
+ !enforceMinNumRacksPerWriteQuorum || prevNode == null);
+ } else {
+ throw e;
+ }
}
- boolean firstBookieInTheEnsemble = (null == prevNode);
- prevNode = selectFromNetworkLocation(curRack, excludeNodes, ensemble, ensemble,
- !enforceMinNumRacksPerWriteQuorum || firstBookieInTheEnsemble);
}
List<BookieId> bookieList = ensemble.toList();
if (ensembleSize != bookieList.size()) {
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
index 0e9233136e..f2a69d3229 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
@@ -1457,7 +1457,6 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase {
public boolean validate() {
return false;
}
-
}, false);
fail("Should get not enough bookies exception since ensemble rejects all the nodes");
} catch (BKNotEnoughBookiesException bnebe) {
@@ -1511,6 +1510,53 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase {
}
}
+ @Test
+ public void testNewEnsembleWithPickDifferentRack() throws Exception {
+ BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
+ BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
+ BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
+ BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
+ // update dns mapping
+ StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/default-region/r2");
+ StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/default-region/r3");
+ // Update cluster
+ Set<BookieId> addrs = new HashSet<BookieId>();
+ addrs.add(addr1.toBookieId());
+ addrs.add(addr2.toBookieId());
+ addrs.add(addr3.toBookieId());
+ addrs.add(addr4.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+
+ int ensembleSize = 3;
+ int writeQuorumSize = 3;
+ int ackQuorumSize = 2;
+
+ Set<BookieId> excludeBookies = new HashSet<>();
+
+ for (int i = 0; i < 50; ++i) {
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ List<BookieId> ensemble = ensembleResponse.getResult();
+ if (ensemble.contains(addr1.toBookieId()) && ensemble.contains(addr2.toBookieId())) {
+ fail("addr1 and addr2 is same rack.");
+ }
+ }
+
+ //addr4 shutdown.
+ addrs.remove(addr4.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+ for (int i = 0; i < 50; ++i) {
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ List<BookieId> ensemble = ensembleResponse.getResult();
+ assertTrue(ensemble.contains(addr1.toBookieId()) && ensemble.contains(addr2.toBookieId()));
+ }
+ }
+
@Test
public void testMinNumRacksPerWriteQuorumOfRacks() throws Exception {
int numOfRacksToCreate = 6;
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
index 7fe5b83db4..52b9a8a63b 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
@@ -605,6 +605,64 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase {
}
}
+ @Test
+ public void testNewEnsembleWithPickDifferentRack() throws Exception {
+ ClientConfiguration clientConf = new ClientConfiguration(conf);
+ clientConf.setMinNumRacksPerWriteQuorum(2);
+ clientConf.setEnforceMinNumFaultDomainsForWrite(false);
+ repp.uninitalize();
+ repp = new RegionAwareEnsemblePlacementPolicy();
+ repp.initialize(clientConf, Optional.<DNSToSwitchMapping>empty(), timer, DISABLE_ALL,
+ NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
+
+ BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
+ BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
+ BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
+ BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
+ BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.5", 3181);
+ // update dns mapping
+ StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/region-1/r1");
+ StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/region-1/r1");
+ StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/region-1/r2");
+ StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/region-1/r3");
+ StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/region-2/r1");
+ // Update cluster
+ Set<BookieId> addrs = new HashSet<BookieId>();
+ addrs.add(addr1.toBookieId());
+ addrs.add(addr2.toBookieId());
+ addrs.add(addr3.toBookieId());
+ addrs.add(addr4.toBookieId());
+ addrs.add(addr5.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+
+ int ensembleSize = 4;
+ int writeQuorumSize = 4;
+ int ackQuorumSize = 2;
+
+ Set<BookieId> excludeBookies = new HashSet<>();
+
+ for (int i = 0; i < 50; ++i) {
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ List<BookieId> ensemble = ensembleResponse.getResult();
+ if (ensemble.contains(addr1.toBookieId()) && ensemble.contains(addr2.toBookieId())) {
+ fail("addr1 and addr2 is same rack.");
+ }
+ }
+
+ //addr4 shutdown.
+ addrs.remove(addr4.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+ for (int i = 0; i < 50; ++i) {
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ List<BookieId> ensemble = ensembleResponse.getResult();
+ assertTrue(ensemble.contains(addr1.toBookieId()) && ensemble.contains(addr2.toBookieId()));
+ }
+ }
+
@Test
public void testNewEnsembleWithEnoughRegions() throws Exception {
BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.2", 3181);
[bookkeeper] 02/02: Fix RegionAwareEnsemblePlacementPolicy.newEnsemble sometimes failed problem. (#3725)
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yong pushed a commit to branch branch-4.15
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
commit b36ebeddd1c63ee5c683a3533180f269b11e939b
Author: Yan Zhao <ho...@apache.org>
AuthorDate: Fri Feb 17 15:09:36 2023 +0800
Fix RegionAwareEnsemblePlacementPolicy.newEnsemble sometimes failed problem. (#3725)
Descriptions of the changes in this PR:
Fixes #3722
### Motivation
See [#3722](https://github.com/apache/bookkeeper/issues/3722#issuecomment-1369859251)
(cherry picked from commit 2381d9b65a37b6e58ffc9c7be2aba35fd37874b7)
---
.../RackawareEnsemblePlacementPolicyImpl.java | 3 +-
.../ZoneawareEnsemblePlacementPolicyImpl.java | 2 +-
.../apache/bookkeeper/net/NetworkTopologyImpl.java | 7 +-
.../TestRackawareEnsemblePlacementPolicy.java | 124 +++++++++++++++++++++
.../TestRegionAwareEnsemblePlacementPolicy.java | 61 ++++++++++
5 files changed, 192 insertions(+), 5 deletions(-)
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
index 49b14da7f7..0461e21b9a 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
@@ -429,13 +429,14 @@ public class RackawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
curRack = curRack + NetworkTopologyImpl.NODE_SEPARATOR + prevNode.getNetworkLocation();
}
}
+ boolean firstBookieInTheEnsemble = (null == prevNode);
try {
prevNode = selectRandomFromRack(curRack, excludeNodes, ensemble, ensemble);
} catch (BKNotEnoughBookiesException e) {
if (!curRack.equals(NodeBase.ROOT)) {
curRack = NodeBase.ROOT;
prevNode = selectFromNetworkLocation(curRack, excludeNodes, ensemble, ensemble,
- !enforceMinNumRacksPerWriteQuorum || prevNode == null);
+ !enforceMinNumRacksPerWriteQuorum || firstBookieInTheEnsemble);
} else {
throw e;
}
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
index bb0c11bee1..f4ca007acf 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/client/ZoneawareEnsemblePlacementPolicyImpl.java
@@ -619,7 +619,7 @@ public class ZoneawareEnsemblePlacementPolicyImpl extends TopologyAwareEnsembleP
if (excludeZones.isEmpty()) {
return "";
}
- StringBuilder excludedZonesString = new StringBuilder("~");
+ StringBuilder excludedZonesString = new StringBuilder(NetworkTopologyImpl.INVERSE);
boolean firstZone = true;
for (String excludeZone : excludeZones) {
if (!firstZone) {
diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
index 19b2c0497f..3d4361d570 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/net/NetworkTopologyImpl.java
@@ -46,6 +46,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
public static final int DEFAULT_HOST_LEVEL = 2;
public static final Logger LOG = LoggerFactory.getLogger(NetworkTopologyImpl.class);
public static final String NODE_SEPARATOR = ",";
+ public static final String INVERSE = "~";
/**
* A marker for an InvalidTopology Exception.
@@ -709,7 +710,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
public Node chooseRandom(String scope) {
netlock.readLock().lock();
try {
- if (scope.startsWith("~")) {
+ if (scope.startsWith(INVERSE)) {
return chooseRandom(NodeBase.ROOT, scope.substring(1));
} else {
return chooseRandom(scope, null);
@@ -775,7 +776,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
public Set<Node> getLeaves(String scope) {
netlock.readLock().lock();
try {
- if (scope.startsWith("~")) {
+ if (scope.startsWith(INVERSE)) {
Set<Node> allNodes = doGetLeaves(NodeBase.ROOT);
String[] excludeScopes = scope.substring(1).split(NODE_SEPARATOR);
Set<Node> excludeNodes = new HashSet<Node>();
@@ -795,7 +796,7 @@ public class NetworkTopologyImpl implements NetworkTopology {
@Override
public int countNumOfAvailableNodes(String scope, Collection<Node> excludedNodes) {
boolean isExcluded = false;
- if (scope.startsWith("~")) {
+ if (scope.startsWith(INVERSE)) {
isExcluded = true;
scope = scope.substring(1);
}
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
index f2a69d3229..f809d1e5b2 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
@@ -1510,6 +1510,130 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase {
}
}
+ //see: https://github.com/apache/bookkeeper/issues/3722
+ @Test
+ public void testNewEnsembleWithMultipleRacksWithCommonRack() throws Exception {
+ ClientConfiguration clientConf = new ClientConfiguration(conf);
+ clientConf.setEnforceMinNumRacksPerWriteQuorum(true);
+ clientConf.setMinNumRacksPerWriteQuorum(3);
+ repp.uninitalize();
+ repp = new RackawareEnsemblePlacementPolicy();
+ repp.initialize(clientConf, Optional.<DNSToSwitchMapping>empty(), timer,
+ DISABLE_ALL, NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
+ repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK);
+
+ BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
+ BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
+ BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
+ BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
+ BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.5", 3181);
+ BookieSocketAddress addr6 = new BookieSocketAddress("127.0.0.6", 3181);
+ BookieSocketAddress addr7 = new BookieSocketAddress("127.0.0.7", 3181);
+ BookieSocketAddress addr8 = new BookieSocketAddress("127.0.0.8", 3181);
+ BookieSocketAddress addr9 = new BookieSocketAddress("127.0.0.9", 3181);
+ BookieSocketAddress addr10 = new BookieSocketAddress("127.0.0.10", 3181);
+ // update dns mapping
+ StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr6.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr7.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr8.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr9.getHostName(), "/default-region/r2");
+ StaticDNSResolver.addNodeToRack(addr10.getHostName(), "/default-region/r3");
+ // Update cluster
+ Set<BookieId> addrs = new HashSet<BookieId>();
+ addrs.add(addr1.toBookieId());
+ addrs.add(addr2.toBookieId());
+ addrs.add(addr3.toBookieId());
+ addrs.add(addr4.toBookieId());
+ addrs.add(addr5.toBookieId());
+ addrs.add(addr6.toBookieId());
+ addrs.add(addr7.toBookieId());
+ addrs.add(addr8.toBookieId());
+ addrs.add(addr9.toBookieId());
+ addrs.add(addr10.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+
+ try {
+ int ensembleSize = 10;
+ int writeQuorumSize = 10;
+ int ackQuorumSize = 2;
+
+ for (int i = 0; i < 50; ++i) {
+ Set<BookieId> excludeBookies = new HashSet<>();
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ }
+ } catch (Exception e) {
+ fail("Can not new ensemble selection succeed");
+ }
+ }
+
+ @Test
+ public void testNewEnsembleWithMultipleRacksWithCommonRackFailed() throws Exception {
+ ClientConfiguration clientConf = new ClientConfiguration(conf);
+ clientConf.setEnforceMinNumRacksPerWriteQuorum(true);
+ clientConf.setMinNumRacksPerWriteQuorum(3);
+ repp.uninitalize();
+ repp = new RackawareEnsemblePlacementPolicy();
+ repp.initialize(clientConf, Optional.<DNSToSwitchMapping>empty(), timer,
+ DISABLE_ALL, NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
+ repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK);
+
+ BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
+ BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
+ BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
+ BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
+ BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.5", 3181);
+ BookieSocketAddress addr6 = new BookieSocketAddress("127.0.0.6", 3181);
+ BookieSocketAddress addr7 = new BookieSocketAddress("127.0.0.7", 3181);
+ BookieSocketAddress addr8 = new BookieSocketAddress("127.0.0.8", 3181);
+ BookieSocketAddress addr9 = new BookieSocketAddress("127.0.0.9", 3181);
+ BookieSocketAddress addr10 = new BookieSocketAddress("127.0.0.10", 3181);
+ // update dns mapping
+ StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr6.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr7.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr8.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr9.getHostName(), "/default-region/r1");
+ StaticDNSResolver.addNodeToRack(addr10.getHostName(), "/default-region/r2");
+ // Update cluster
+ Set<BookieId> addrs = new HashSet<BookieId>();
+ addrs.add(addr1.toBookieId());
+ addrs.add(addr2.toBookieId());
+ addrs.add(addr3.toBookieId());
+ addrs.add(addr4.toBookieId());
+ addrs.add(addr5.toBookieId());
+ addrs.add(addr6.toBookieId());
+ addrs.add(addr7.toBookieId());
+ addrs.add(addr8.toBookieId());
+ addrs.add(addr9.toBookieId());
+ addrs.add(addr10.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+
+ try {
+ int ensembleSize = 10;
+ int writeQuorumSize = 10;
+ int ackQuorumSize = 2;
+
+ Set<BookieId> excludeBookies = new HashSet<>();
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ fail("Can not new ensemble selection succeed");
+ } catch (Exception e) {
+ assertTrue(e instanceof BKNotEnoughBookiesException);
+ }
+ }
+
@Test
public void testNewEnsembleWithPickDifferentRack() throws Exception {
BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
index 52b9a8a63b..ba9c4f862f 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestRegionAwareEnsemblePlacementPolicy.java
@@ -705,6 +705,67 @@ public class TestRegionAwareEnsemblePlacementPolicy extends TestCase {
}
}
+ @Test
+ public void testNewEnsembleWithMultipleRacksWithCommonRack() throws Exception {
+ ClientConfiguration clientConf = new ClientConfiguration(conf);
+ clientConf.setEnforceMinNumRacksPerWriteQuorum(true);
+ clientConf.setMinNumRacksPerWriteQuorum(3);
+ repp.uninitalize();
+ repp = new RegionAwareEnsemblePlacementPolicy();
+ repp.initialize(clientConf, Optional.<DNSToSwitchMapping>empty(), timer,
+ DISABLE_ALL, NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
+
+ BookieSocketAddress addr1 = new BookieSocketAddress("127.0.0.1", 3181);
+ BookieSocketAddress addr2 = new BookieSocketAddress("127.0.0.2", 3181);
+ BookieSocketAddress addr3 = new BookieSocketAddress("127.0.0.3", 3181);
+ BookieSocketAddress addr4 = new BookieSocketAddress("127.0.0.4", 3181);
+ BookieSocketAddress addr5 = new BookieSocketAddress("127.0.0.5", 3181);
+ BookieSocketAddress addr6 = new BookieSocketAddress("127.0.0.6", 3181);
+ BookieSocketAddress addr7 = new BookieSocketAddress("127.0.0.7", 3181);
+ BookieSocketAddress addr8 = new BookieSocketAddress("127.0.0.8", 3181);
+ BookieSocketAddress addr9 = new BookieSocketAddress("127.0.0.9", 3181);
+ BookieSocketAddress addr10 = new BookieSocketAddress("127.0.0.10", 3181);
+ // update dns mapping
+ StaticDNSResolver.addNodeToRack(addr1.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr2.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr3.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr4.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr5.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr6.getHostName(), "/region1/r1");
+ StaticDNSResolver.addNodeToRack(addr7.getHostName(), "/region1/r2");
+ StaticDNSResolver.addNodeToRack(addr8.getHostName(), "/region1/r3");
+ StaticDNSResolver.addNodeToRack(addr9.getHostName(), "/region2/r1");
+ StaticDNSResolver.addNodeToRack(addr10.getHostName(), "/region3/r1");
+ // Update cluster
+ Set<BookieId> addrs = new HashSet<BookieId>();
+ addrs.add(addr1.toBookieId());
+ addrs.add(addr2.toBookieId());
+ addrs.add(addr3.toBookieId());
+ addrs.add(addr4.toBookieId());
+ addrs.add(addr5.toBookieId());
+ addrs.add(addr6.toBookieId());
+ addrs.add(addr7.toBookieId());
+ addrs.add(addr8.toBookieId());
+ addrs.add(addr9.toBookieId());
+ addrs.add(addr10.toBookieId());
+ repp.onClusterChanged(addrs, new HashSet<BookieId>());
+
+ try {
+ int ensembleSize = 10;
+ int writeQuorumSize = 10;
+ int ackQuorumSize = 2;
+
+ for (int i = 0; i < 50; ++i) {
+ Set<BookieId> excludeBookies = new HashSet<>();
+ EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
+ repp.newEnsemble(ensembleSize, writeQuorumSize,
+ ackQuorumSize, null, excludeBookies);
+ }
+ } catch (Exception e) {
+ fail("RegionAwareEnsemblePlacementPolicy should newEnsemble succeed.");
+ }
+ }
+
@Test
public void testNewEnsembleWithThreeRegions() throws Exception {
repp.uninitalize();