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

Jump to bottom

[improve] Optimize reorderReadSequence to Check WriteSet #4478

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[improve] Optimize reorderReadSequence to Check WriteSet #4478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 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 @@ -920,8 +920,9 @@ DistributionSchedule.WriteSet reorderReadSequenceWithRegion(
if (useRegionAware || reorderReadsRandom) {
isAnyBookieUnavailable = true;
} else {
for (int i = 0; i < ensemble.size(); i++) {
BookieId bookieAddr = ensemble.get(i);
for (int i = 0; i < writeSet.size(); i++) {
int idx = writeSet.get(i);
BookieId bookieAddr = ensemble.get(idx);
if ((!knownBookies.containsKey(bookieAddr) && !readOnlyBookies.contains(bookieAddr))
|| slowBookies.getIfPresent(bookieAddr) != null) {
// Found at least one bookie not available in the ensemble, or in slowBookies
Expand Down
39 changes: 39 additions & 0 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 @@ -64,6 +64,7 @@
import org.apache.bookkeeper.stats.Gauge;
import org.apache.bookkeeper.stats.NullStatsLogger;
import org.apache.bookkeeper.test.TestStatsProvider;
import org.apache.bookkeeper.test.TestStatsProvider.TestOpStatsLogger;
import org.apache.bookkeeper.test.TestStatsProvider.TestStatsLogger;
import org.apache.bookkeeper.util.StaticDNSResolver;
import org.apache.commons.collections4.CollectionUtils;
Expand Down Expand Up @@ -2359,6 +2360,44 @@ public void testNodeWithFailures() throws Exception {
StaticDNSResolver.reset();
}

@Test
public void testSlowBookieInEnsembleOnly() throws Exception {
repp.uninitalize();
updateMyRack("/r1/rack1");

TestStatsProvider statsProvider = new TestStatsProvider();
TestStatsLogger statsLogger = statsProvider.getStatsLogger("");

repp = new RackawareEnsemblePlacementPolicy();
repp.initialize(conf, Optional.<DNSToSwitchMapping>empty(), timer,
DISABLE_ALL, statsLogger, BookieSocketAddress.LEGACY_BOOKIEID_RESOLVER);
repp.withDefaultRack(NetworkTopology.DEFAULT_REGION_AND_RACK);

TestOpStatsLogger readRequestsReorderedCounter = (TestOpStatsLogger) statsLogger
.getOpStatsLogger(BookKeeperClientStats.READ_REQUESTS_REORDERED);

// 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>());
repp.registerSlowBookie(addr1.toBookieId(), 0L);
Map<BookieId, Long> bookiePendingMap = new HashMap<>();
bookiePendingMap.put(addr1.toBookieId(), 1L);
repp.onClusterChanged(addrs, new HashSet<>());

DistributionSchedule.WriteSet writeSet = writeSetFromValues(1, 2, 3);

DistributionSchedule.WriteSet reorderSet = repp.reorderReadSequence(
ensemble, getBookiesHealthInfo(new HashMap<>(), bookiePendingMap), writeSet);

// If the slow bookie is only present in the ensemble, no reordering occurs.
assertEquals(writeSet, reorderSet);
assertEquals(0, readRequestsReorderedCounter.getSuccessCount());
}

@Test
public void testReplaceNotAvailableBookieWithDefaultRack() throws Exception {
repp.uninitalize();
Expand Down