Skip to content

[ISSUE #10193] Fix incorrect min offset when next store returns -1 #10236

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

Closed
Wubabalala wants to merge 1 commit into from
Closed

[ISSUE #10193] Fix incorrect min offset when next store returns -1 #10236

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
3 changes: 3 additions & 0 deletions tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,9 @@ public long getMinOffsetInQueue(String topic, int queueId) {
if (minOffsetInTieredStore < 0) {
return minOffsetInNextStore;
}
if (minOffsetInNextStore < 0) {
return minOffsetInTieredStore;
}
return Math.min(minOffsetInNextStore, minOffsetInTieredStore);
}

Expand Down
6 changes: 6 additions & 0 deletions tieredstore/src/test/java/org/apache/rocketmq/tieredstore/TieredMessageStoreTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,12 @@ public void testGetMinOffsetInQueue() {

Mockito.when(flatFile.getConsumeQueueMinOffset()).thenReturn(10L);
Assert.assertEquals(10L, currentStore.getMinOffsetInQueue(mq.getTopic(), mq.getQueueId()));

// When local store returns -1 (no valid offset), tiered store offset should be used
long tieredOffset = flatFile.getConsumeQueueMinOffset();
Assert.assertTrue("tiered offset should be valid for this test", tieredOffset >= 0);
Mockito.when(defaultStore.getMinOffsetInQueue(anyString(), anyInt())).thenReturn(-1L);
Assert.assertEquals(tieredOffset, currentStore.getMinOffsetInQueue(mq.getTopic(), mq.getQueueId()));
}

@Test
Expand Down