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

bugfix for RackawareEnsemblePlacementPolicyImpl.isEnsembleAdheringToPlacementPolicy #2957

Closed
wants to merge 2 commits into from
Closed

bugfix for RackawareEnsemblePlacementPolicyImpl.isEnsembleAdheringToPlacementPolicy #2957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
003c1bb
bugfix:
Dec 23, 2021
ad1c561
update test case
Jan 13, 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
4 changes: 2 additions & 2 deletions ...rver/src/main/java/org/apache/bookkeeper/client/RackawareEnsemblePlacementPolicyImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,8 +1035,8 @@ public PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy(List<BookieI
LOG.warn("Received exception while trying to get network location of bookie: {}", bookie, e);
}
}
if ((racksInQuorum.size() < minNumRacksPerWriteQuorumForThisEnsemble)
|| (enforceMinNumRacksPerWriteQuorum && racksInQuorum.contains(getDefaultRack()))) {
if (enforceMinNumRacksPerWriteQuorum && (racksInQuorum.size() < minNumRacksPerWriteQuorumForThisEnsemble
|| racksInQuorum.contains(getDefaultRack()))) {
return PlacementPolicyAdherence.FAIL;
}
}
Expand Down
13 changes: 7 additions & 6 deletions ...rver/src/test/java/org/apache/bookkeeper/client/TestRackawareEnsemblePlacementPolicy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class TestRackawareEnsemblePlacementPolicy extends TestCase {
BookieSocketAddress addr2, addr3, addr4;
io.netty.util.HashedWheelTimer timer;
final int minNumRacksPerWriteQuorumConfValue = 2;
final boolean enforceMinNumRacksPerWriteQuorum = true;

@Override
protected void setUp() throws Exception {
Expand Down Expand Up @@ -746,7 +747,7 @@ public void testSingleRackWithEnforceMinNumRacks() throws Exception {

ClientConfiguration clientConf = new ClientConfiguration(conf);
clientConf.setMinNumRacksPerWriteQuorum(2);
clientConf.setEnforceMinNumRacksPerWriteQuorum(true);
clientConf.setEnforceMinNumRacksPerWriteQuorum(enforceMinNumRacksPerWriteQuorum);
repp = new RackawareEnsemblePlacementPolicy();
repp.initialize(clientConf, Optional.<DNSToSwitchMapping> empty(), timer, DISABLE_ALL,
NullStatsLogger.INSTANCE, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
Expand Down Expand Up @@ -783,7 +784,7 @@ public void testNewEnsembleWithEnforceMinNumRacks() throws Exception {
ClientConfiguration clientConf = new ClientConfiguration(conf);
clientConf.setMinNumRacksPerWriteQuorum(minNumRacksPerWriteQuorum);
// set enforceMinNumRacksPerWriteQuorum
clientConf.setEnforceMinNumRacksPerWriteQuorum(true);
clientConf.setEnforceMinNumRacksPerWriteQuorum(enforceMinNumRacksPerWriteQuorum);
TestStatsProvider statsProvider = new TestStatsProvider();
TestStatsLogger statsLogger = statsProvider.getStatsLogger("");
repp = new RackawareEnsemblePlacementPolicy();
Expand Down Expand Up @@ -1447,7 +1448,7 @@ public void testNewEnsembleWithMultipleRacks() throws Exception {
int numCovered = getNumCoveredWriteQuorums(ensemble, writeQuorumSize,
conf.getMinNumRacksPerWriteQuorum(), repp.bookieAddressResolver);
assertTrue(numCovered >= 1 && numCovered < 3);
assertEquals(PlacementPolicyAdherence.FAIL, isEnsembleAdheringToPlacementPolicy);
assertEquals(PlacementPolicyAdherence.MEETS_STRICT, isEnsembleAdheringToPlacementPolicy);
ensembleSize = 4;
EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse2 =
repp.newEnsemble(ensembleSize, writeQuorumSize,
Expand All @@ -1457,7 +1458,7 @@ public void testNewEnsembleWithMultipleRacks() throws Exception {
numCovered = getNumCoveredWriteQuorums(ensemble2, writeQuorumSize,
conf.getMinNumRacksPerWriteQuorum(), repp.bookieAddressResolver);
assertTrue(numCovered >= 1 && numCovered < 3);
assertEquals(PlacementPolicyAdherence.FAIL, isEnsembleAdheringToPlacementPolicy2);
assertEquals(PlacementPolicyAdherence.MEETS_STRICT, isEnsembleAdheringToPlacementPolicy2);
} catch (BKNotEnoughBookiesException bnebe) {
fail("Should not get not enough bookies exception even there is only one rack.");
}
Expand Down Expand Up @@ -2026,15 +2027,15 @@ public void testPlacementOnStabilizeNetworkTopology() throws Exception {
List<BookieId> ensemble = ensembleResponse.getResult();
PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy = ensembleResponse.isAdheringToPolicy();
assertFalse(ensemble.contains(addr4.toBookieId()));
assertEquals(PlacementPolicyAdherence.FAIL, isEnsembleAdheringToPlacementPolicy);
assertEquals(PlacementPolicyAdherence.MEETS_STRICT, isEnsembleAdheringToPlacementPolicy);
}

// we could still use addr4 for urgent allocation if it is just bookie flapping
EnsemblePlacementPolicy.PlacementResult<List<BookieId>> ensembleResponse =
repp.newEnsemble(4, 2, 2, null, new HashSet<BookieId>());
List<BookieId> ensemble = ensembleResponse.getResult();
PlacementPolicyAdherence isEnsembleAdheringToPlacementPolicy = ensembleResponse.isAdheringToPolicy();
assertEquals(PlacementPolicyAdherence.FAIL, isEnsembleAdheringToPlacementPolicy);
assertEquals(PlacementPolicyAdherence.MEETS_STRICT, isEnsembleAdheringToPlacementPolicy);
assertTrue(ensemble.contains(addr4.toBookieId()));
}

Expand Down
4 changes: 4 additions & 0 deletions ...rver/src/test/java/org/apache/bookkeeper/replication/AuditorPlacementPolicyCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicy() th
int writeQuorumSize = 3;
int ackQuorumSize = 2;
int minNumRacksPerWriteQuorumConfValue = 3;
boolean enforceMinNumRacksPerWriteQuorum = true;

/*
* this closed ledger doesn't adhere to placement policy because there are only
Expand Down Expand Up @@ -273,6 +274,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPlacementPolicy() th

ServerConfiguration servConf = new ServerConfiguration(confByIndex(0));
servConf.setMinNumRacksPerWriteQuorum(minNumRacksPerWriteQuorumConfValue);
servConf.setEnforceMinNumRacksPerWriteQuorum(enforceMinNumRacksPerWriteQuorum);
setServerConfigPropertiesForRackPlacement(servConf);
MutableObject<Auditor> auditorRef = new MutableObject<Auditor>();
try {
Expand Down Expand Up @@ -454,6 +456,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPolicyWithMultipleSe
int writeQuorumSize = 5;
int ackQuorumSize = 2;
int minNumRacksPerWriteQuorumConfValue = 4;
boolean enforceMinNumRacksPerWriteQuorum = true;

/*
* this closed ledger in each writeQuorumSize (5), there would be
Expand Down Expand Up @@ -510,6 +513,7 @@ public void testPlacementPolicyCheckWithLedgersNotAdheringToPolicyWithMultipleSe

ServerConfiguration servConf = new ServerConfiguration(confByIndex(0));
servConf.setMinNumRacksPerWriteQuorum(minNumRacksPerWriteQuorumConfValue);
servConf.setEnforceMinNumRacksPerWriteQuorum(enforceMinNumRacksPerWriteQuorum);
setServerConfigPropertiesForRackPlacement(servConf);
MutableObject<Auditor> auditorRef = new MutableObject<Auditor>();
try {
Expand Down