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

[ISSUE #7363] Fix get message from tiered storage return incorrect next begin offset #7365

Merged
merged 1 commit into from
Sep 19, 2023
Merged

[ISSUE #7363] Fix get message from tiered storage return incorrect next begin offset #7365

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
2 changes: 1 addition & 1 deletion tieredstore/src/main/java/org/apache/rocketmq/tieredstore/TieredMessageFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public CompletableFuture<GetMessageResult> getMessageFromCacheAsync(CompositeQue
}

// if cache is miss, immediately pull messages
LOGGER.warn("TieredMessageFetcher#getMessageFromCacheAsync: cache miss: " +
LOGGER.info("TieredMessageFetcher#getMessageFromCacheAsync: cache miss: " +
"topic: {}, queue: {}, queue offset: {}, max message num: {}",
mq.getTopic(), mq.getQueueId(), queueOffset, maxCount);

Expand Down
29 changes: 16 additions & 13 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 @@ -147,6 +147,11 @@ public GetMessageResult getMessage(String group, String topic, int queueId, long
public CompletableFuture<GetMessageResult> getMessageAsync(String group, String topic,
int queueId, long offset, int maxMsgNums, MessageFilter messageFilter) {

// For system topic, force reading from local store
if (TieredStoreUtil.isSystemTopic(topic) || PopAckConstants.isStartWithRevivePrefix(topic)) {
return next.getMessageAsync(group, topic, queueId, offset, maxMsgNums, messageFilter);
}

if (fetchFromCurrentStore(topic, queueId, offset, maxMsgNums)) {
logger.trace("GetMessageAsync from current store, topic: {}, queue: {}, offset: {}", topic, queueId, offset);
} else {
Expand All @@ -158,6 +163,7 @@ public CompletableFuture<GetMessageResult> getMessageAsync(String group, String
return fetcher
.getMessageAsync(group, topic, queueId, offset, maxMsgNums, messageFilter)
.thenApply(result -> {

Attributes latencyAttributes = TieredStoreMetricsManager.newAttributesBuilder()
.put(TieredStoreMetricsConstant.LABEL_OPERATION, TieredStoreMetricsConstant.OPERATION_API_GET_MESSAGE)
.put(TieredStoreMetricsConstant.LABEL_TOPIC, topic)
Expand All @@ -166,8 +172,7 @@ public CompletableFuture<GetMessageResult> getMessageAsync(String group, String
TieredStoreMetricsManager.apiLatency.record(stopwatch.elapsed(TimeUnit.MILLISECONDS), latencyAttributes);

if (result.getStatus() == GetMessageStatus.OFFSET_FOUND_NULL ||
result.getStatus() == GetMessageStatus.OFFSET_OVERFLOW_ONE ||
result.getStatus() == GetMessageStatus.OFFSET_OVERFLOW_BADLY) {
result.getStatus() == GetMessageStatus.NO_MATCHED_LOGIC_QUEUE) {

if (next.checkInStoreByConsumeOffset(topic, queueId, offset)) {
TieredStoreMetricsManager.fallbackTotal.add(1, latencyAttributes);
Expand All @@ -178,14 +183,8 @@ public CompletableFuture<GetMessageResult> getMessageAsync(String group, String
}
}

// Fetch system topic data from the broker when using the force level.
if (result.getStatus() == GetMessageStatus.NO_MATCHED_LOGIC_QUEUE) {
if (TieredStoreUtil.isSystemTopic(topic) || PopAckConstants.isStartWithRevivePrefix(topic)) {
return next.getMessage(group, topic, queueId, offset, maxMsgNums, messageFilter);
}
}

if (result.getStatus() != GetMessageStatus.FOUND &&
result.getStatus() != GetMessageStatus.NO_MATCHED_LOGIC_QUEUE &&
result.getStatus() != GetMessageStatus.OFFSET_OVERFLOW_ONE &&
result.getStatus() != GetMessageStatus.OFFSET_OVERFLOW_BADLY) {
logger.warn("GetMessageAsync not found and message is not in next store, result: {}, " +
Expand All @@ -206,10 +205,14 @@ public CompletableFuture<GetMessageResult> getMessageAsync(String group, String
if (minOffsetInQueue >= 0 && minOffsetInQueue < result.getMinOffset()) {
result.setMinOffset(minOffsetInQueue);
}
long maxOffsetInQueue = next.getMaxOffsetInQueue(topic, queueId);
if (maxOffsetInQueue >= 0 && maxOffsetInQueue > result.getMaxOffset()) {
result.setMaxOffset(maxOffsetInQueue);
}

// In general, the local cq offset is slightly greater than the commit offset in read message,
// so there is no need to update the maximum offset to the local cq offset here,
// otherwise it will cause repeated consumption after next begin offset over commit offset.

logger.trace("GetMessageAsync result, group: {}, topic: {}, queueId: {}, offset: {}, count:{}, {}",
group, topic, queueId, offset, maxMsgNums, result);

return result;
}).exceptionally(e -> {
logger.error("GetMessageAsync from tiered store failed", e);
Expand Down
5 changes: 3 additions & 2 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 @@ -168,7 +168,7 @@ public void testGetMessageAsync() {
GetMessageResult result1 = new GetMessageResult();
result1.setStatus(GetMessageStatus.FOUND);
GetMessageResult result2 = new GetMessageResult();
result2.setStatus(GetMessageStatus.MESSAGE_WAS_REMOVING);
result2.setStatus(GetMessageStatus.OFFSET_OVERFLOW_BADLY);

when(fetcher.getMessageAsync(anyString(), anyString(), anyInt(), anyLong(), anyInt(), any())).thenReturn(CompletableFuture.completedFuture(result1));
when(nextStore.getMessage(anyString(), anyString(), anyInt(), anyLong(), anyInt(), any())).thenReturn(result2);
Expand All @@ -188,7 +188,8 @@ public void testGetMessageAsync() {
properties.setProperty("tieredStorageLevel", "3");
configuration.update(properties);
when(nextStore.checkInStoreByConsumeOffset(anyString(), anyInt(), anyLong())).thenReturn(true);
Assert.assertSame(result2, store.getMessage("group", mq.getTopic(), mq.getQueueId(), 0, 0, null));
Assert.assertEquals(result2.getStatus(),
store.getMessage("group", mq.getTopic(), mq.getQueueId(), 0, 0, null).getStatus());
}

@Test
Expand Down
Loading