Skip to content

Use READ_ENTRY_SCHEDULING_DELAY to stable stickyReadsWithFailures #3628

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

Merged
hangc0276 merged 1 commit into from
Dec 7, 2022
Merged

Use READ_ENTRY_SCHEDULING_DELAY to stable stickyReadsWithFailures #3628

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
19 changes: 10 additions & 9 deletions bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieStickyReadsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class BookieStickyReadsTest extends BookKeeperClusterTestCase {

private static final int NUM_BOOKIES = 3;

private static final String READ_ENTRY_REQUEST_METRIC = "bookkeeper_server.READ_ENTRY_REQUEST";
private static final String READ_ENTRY_SCHEDULING_DELAY_METRIC = "bookkeeper_server.READ_ENTRY_SCHEDULING_DELAY";

public BookieStickyReadsTest() {
super(NUM_BOOKIES);
Expand All @@ -64,7 +64,8 @@ public void testNormalReads() throws Exception {
writeAndReadEntries(conf, 3, 3, 3);

// All bookies should have received at least some read request
getBookieReadRequestStats().values().forEach(readRequests -> assertTrue(readRequests > 0));
getBookieReadEntrySchedulingDelayStats().values()
.forEach(readRequests -> assertTrue(readRequests > 0));
}

@Test
Expand All @@ -76,7 +77,8 @@ public void testStickyFlagWithStriping() throws Exception {

// All bookies should have received at least some read request since we
// don't enable sticky reads when striping is enabled
getBookieReadRequestStats().values().forEach(readRequests -> assertTrue(readRequests > 0));
getBookieReadEntrySchedulingDelayStats().values()
.forEach(readRequests -> assertTrue(readRequests > 0));
}

@Test
Expand All @@ -87,7 +89,7 @@ public void stickyReadsWithNoFailures() throws Exception {
writeAndReadEntries(conf, 3, 3, 3);

// All read requests should have been made to a single bookie
Map<Integer, Long> stats = getBookieReadRequestStats();
Map<Integer, Long> stats = getBookieReadEntrySchedulingDelayStats();
boolean foundBookieWithRequests = false;
for (long readRequests : stats.values()) {
if (readRequests > 0) {
Expand Down Expand Up @@ -137,7 +139,7 @@ public void stickyReadsWithFailures() throws Exception {
// All read requests should have been made to a single bookie
int bookieWithRequests = -1;
for (int i = 0; i < NUM_BOOKIES; i++) {
long requests = getStatsProvider(i).getOpStatsLogger(READ_ENTRY_REQUEST_METRIC)
long requests = getStatsProvider(i).getOpStatsLogger(READ_ENTRY_SCHEDULING_DELAY_METRIC)
.getSuccessCount();

log.info("Bookie {} --- requests: {}", i, requests);
Expand All @@ -162,18 +164,17 @@ public void stickyReadsWithFailures() throws Exception {
// At this point, we should have 1 bookie with 1 request (the initial
// request), and a second bookie with 10 requests. The 3rd bookie should
// have no requests
List<Long> requestCounts = Lists.newArrayList(getBookieReadRequestStats().values());
List<Long> requestCounts = Lists.newArrayList(getBookieReadEntrySchedulingDelayStats().values());
Collections.sort(requestCounts);

assertEquals(0, requestCounts.get(0).longValue());
assertEquals(1, requestCounts.get(1).longValue());
assertEquals(10, requestCounts.get(2).longValue());
}

private Map<Integer, Long> getBookieReadRequestStats() throws Exception {
private Map<Integer, Long> getBookieReadEntrySchedulingDelayStats() throws Exception {
Map<Integer, Long> stats = new TreeMap<>();
for (int i = 0; i < NUM_BOOKIES; i++) {
stats.put(i, getStatsProvider(i).getOpStatsLogger(READ_ENTRY_REQUEST_METRIC)
stats.put(i, getStatsProvider(i).getOpStatsLogger(READ_ENTRY_SCHEDULING_DELAY_METRIC)
.getSuccessCount());
}

Expand Down