Skip to content

[studio][ISSUE #10904] Tolerate malformed Proxy retry counters #10905

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

Draft
messere1 wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

[studio][ISSUE #10904] Tolerate malformed Proxy retry counters #10905

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
12 changes: 10 additions & 2 deletions proxy/src/main/java/org/apache/rocketmq/proxy/processor/ProducerProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,21 @@ protected SendMessageRequestHeader buildSendMessageRequestHeader(List<Message> m
if (requestHeader.getTopic().startsWith(MixAll.RETRY_GROUP_TOPIC_PREFIX)) {
String reconsumeTimes = MessageAccessor.getReconsumeTime(message);
if (reconsumeTimes != null) {
requestHeader.setReconsumeTimes(Integer.valueOf(reconsumeTimes));
try {
requestHeader.setReconsumeTimes(Integer.valueOf(reconsumeTimes));
} catch (NumberFormatException e) {
log.warn("parse reconsume times error, with value:{}", reconsumeTimes);
}
MessageAccessor.clearProperty(message, MessageConst.PROPERTY_RECONSUME_TIME);
}

String maxReconsumeTimes = MessageAccessor.getMaxReconsumeTimes(message);
if (maxReconsumeTimes != null) {
requestHeader.setMaxReconsumeTimes(Integer.valueOf(maxReconsumeTimes));
try {
requestHeader.setMaxReconsumeTimes(Integer.valueOf(maxReconsumeTimes));
} catch (NumberFormatException e) {
log.warn("parse max reconsume times error, with value:{}", maxReconsumeTimes);
}
MessageAccessor.clearProperty(message, MessageConst.PROPERTY_MAX_RECONSUME_TIMES);
}
}
Expand Down
17 changes: 17 additions & 0 deletions proxy/src/test/java/org/apache/rocketmq/proxy/processor/ProducerProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
Expand Down Expand Up @@ -53,6 +54,7 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
Expand Down Expand Up @@ -188,6 +190,21 @@ public void testSendRetryMessage() throws Throwable {
assertEquals(16, requestHeader.getMaxReconsumeTimes().intValue());
}

@Test
public void testBuildSendMessageRequestHeaderWithMalformedRetryCounters() {
Message message = createMessageExt(MixAll.getRetryTopic(CONSUMER_GROUP), "tag", 0, 0);
MessageAccessor.putProperty(message, MessageConst.PROPERTY_RECONSUME_TIME, "not-a-number");
MessageAccessor.putProperty(message, MessageConst.PROPERTY_MAX_RECONSUME_TIMES, "also-invalid");

SendMessageRequestHeader requestHeader = producerProcessor.buildSendMessageRequestHeader(
Collections.singletonList(message), PRODUCER_GROUP, 0, 0);

assertEquals(0, requestHeader.getReconsumeTimes().intValue());
assertNull(requestHeader.getMaxReconsumeTimes());
assertNull(MessageAccessor.getReconsumeTime(message));
assertNull(MessageAccessor.getMaxReconsumeTimes(message));
}

@Test
public void testForwardMessageToDeadLetterQueue() throws Throwable {
ArgumentCaptor<ConsumerSendMsgBackRequestHeader> requestHeaderArgumentCaptor = ArgumentCaptor.forClass(ConsumerSendMsgBackRequestHeader.class);
Expand Down