You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2022/08/01 06:11:30 UTC
[rocketmq] 01/04: change poll time calculate method; init PopMessageResultFilter by maxAttempts directly
This is an automated email from the ASF dual-hosted git repository.
yukon pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 2ac15dd8b345ebe6e8d982ddb2cb0e25b2819831
Author: kaiyi.lk <ka...@alibaba-inc.com>
AuthorDate: Sun Jul 31 20:58:08 2022 +0800
change poll time calculate method; init PopMessageResultFilter by maxAttempts directly
---
.../v2/consumer/PopMessageResultFilterImpl.java | 8 ++---
.../grpc/v2/consumer/ReceiveMessageActivity.java | 14 +++------
.../v2/consumer/ReceiveMessageActivityTest.java | 36 ++++++++++++++++++++++
.../apache/rocketmq/test/grpc/v2/GrpcBaseIT.java | 1 +
4 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/PopMessageResultFilterImpl.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/PopMessageResultFilterImpl.java
index 3f9f2b217..391856a08 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/PopMessageResultFilterImpl.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/PopMessageResultFilterImpl.java
@@ -20,21 +20,19 @@ import org.apache.rocketmq.common.message.MessageExt;
import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.common.utils.FilterUtils;
-import org.apache.rocketmq.proxy.grpc.v2.common.GrpcClientSettingsManager;
import org.apache.rocketmq.proxy.processor.PopMessageResultFilter;
public class PopMessageResultFilterImpl implements PopMessageResultFilter {
- private final GrpcClientSettingsManager grpcClientSettingsManager;
+ private final int maxAttempts;
- public PopMessageResultFilterImpl(GrpcClientSettingsManager manager) {
- grpcClientSettingsManager = manager;
+ public PopMessageResultFilterImpl(int maxAttempts) {
+ this.maxAttempts = maxAttempts;
}
@Override
public FilterResult filterMessage(ProxyContext ctx, String consumerGroup, SubscriptionData subscriptionData,
MessageExt messageExt) {
- int maxAttempts = grpcClientSettingsManager.getClientSettings(ctx).getBackoffPolicy().getMaxAttempts();
if (!FilterUtils.isTagMatched(subscriptionData.getTagsSet(), messageExt.getTags())) {
return FilterResult.NO_MATCH;
}
diff --git a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
index b69db78b1..555a036ee 100644
--- a/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
+++ b/proxy/src/main/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivity.java
@@ -24,7 +24,6 @@ import apache.rocketmq.v2.Settings;
import apache.rocketmq.v2.Subscription;
import com.google.protobuf.util.Durations;
import io.grpc.stub.StreamObserver;
-import java.time.Duration;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.consumer.PopStatus;
@@ -65,16 +64,13 @@ public class ReceiveMessageActivity extends AbstractMessingActivity {
Settings settings = this.grpcClientSettingsManager.getClientSettings(ctx);
Subscription subscription = settings.getSubscription();
boolean fifo = subscription.getFifo();
+ int maxAttempts = settings.getBackoffPolicy().getMaxAttempts();
ProxyConfig config = ConfigurationManager.getProxyConfig();
Long timeRemaining = ctx.getRemainingMs();
- if (timeRemaining == null) {
- timeRemaining = Duration.ofSeconds(20).toMillis();
- }
- long pollTime = timeRemaining - config.getLongPollingReserveTimeInMillis();
- if (pollTime <= 0) {
- writer.writeAndComplete(ctx, Code.BAD_REQUEST, "time remaining is too small");
- return;
+ long pollTime = timeRemaining - Durations.toMillis(settings.getRequestTimeout()) / 2;
+ if (pollTime < 0) {
+ pollTime = 0;
}
if (pollTime > config.getGrpcClientConsumerLongPollingTimeoutMillis()) {
pollTime = config.getGrpcClientConsumerLongPollingTimeoutMillis();
@@ -116,7 +112,7 @@ public class ReceiveMessageActivity extends AbstractMessingActivity {
ConsumeInitMode.MAX,
subscriptionData,
fifo,
- new PopMessageResultFilterImpl(grpcClientSettingsManager),
+ new PopMessageResultFilterImpl(maxAttempts),
timeRemaining
).thenAccept(popResult -> {
if (proxyConfig.isEnableProxyAutoRenew() && request.getAutoRenew()) {
diff --git a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivityTest.java b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivityTest.java
index 2df5480a7..c7d90b874 100644
--- a/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivityTest.java
+++ b/proxy/src/test/java/org/apache/rocketmq/proxy/grpc/v2/consumer/ReceiveMessageActivityTest.java
@@ -29,6 +29,7 @@ import com.google.protobuf.util.Durations;
import io.grpc.stub.ServerCallStreamObserver;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -74,6 +75,41 @@ public class ReceiveMessageActivityTest extends BaseActivityTest {
grpcClientSettingsManager, grpcChannelManager);
}
+ @Test
+ public void testReceiveMessagePollingTime() {
+ StreamObserver<ReceiveMessageResponse> receiveStreamObserver = mock(ServerCallStreamObserver.class);
+ ArgumentCaptor<ReceiveMessageResponse> responseArgumentCaptor = ArgumentCaptor.forClass(ReceiveMessageResponse.class);
+ doNothing().when(receiveStreamObserver).onNext(responseArgumentCaptor.capture());
+
+ ArgumentCaptor<Long> pollTimeCaptor = ArgumentCaptor.forClass(Long.class);
+ when(this.grpcClientSettingsManager.getClientSettings(any())).thenReturn(Settings.newBuilder()
+ .setRequestTimeout(Durations.fromSeconds(3))
+ .build());
+ when(this.messagingProcessor.popMessage(any(), any(), anyString(), anyString(), anyInt(), anyLong(),
+ pollTimeCaptor.capture(), anyInt(), any(), anyBoolean(), any(), anyLong()))
+ .thenReturn(CompletableFuture.completedFuture(new PopResult(PopStatus.NO_NEW_MSG, Collections.emptyList())));
+
+
+ ProxyContext context = createContext();
+ context.setRemainingMs(1L);
+ this.receiveMessageActivity.receiveMessage(
+ context,
+ ReceiveMessageRequest.newBuilder()
+ .setGroup(Resource.newBuilder().setName(CONSUMER_GROUP).build())
+ .setMessageQueue(MessageQueue.newBuilder().setTopic(Resource.newBuilder().setName(TOPIC).build()).build())
+ .setAutoRenew(true)
+ .setFilterExpression(FilterExpression.newBuilder()
+ .setType(FilterType.TAG)
+ .setExpression("*")
+ .build())
+ .build(),
+ receiveStreamObserver
+ );
+
+ assertEquals(Code.MESSAGE_NOT_FOUND, getResponseCodeFromReceiveMessageResponseList(responseArgumentCaptor.getAllValues()));
+ assertEquals(0L, pollTimeCaptor.getValue().longValue());
+ }
+
@Test
public void testReceiveMessageIllegalFilter() {
StreamObserver<ReceiveMessageResponse> receiveStreamObserver = mock(ServerCallStreamObserver.class);
diff --git a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
index 35f01920d..79ebc2db2 100644
--- a/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/grpc/v2/GrpcBaseIT.java
@@ -765,6 +765,7 @@ public class GrpcBaseIT extends BaseConf {
public Settings buildPushConsumerClientSettings(int maxDeliveryAttempts, String group) {
return Settings.newBuilder()
.setClientType(ClientType.PUSH_CONSUMER)
+ .setRequestTimeout(Durations.fromSeconds(3))
.setBackoffPolicy(RetryPolicy.newBuilder()
.setMaxAttempts(maxDeliveryAttempts)
.build())