fix: fix the receive timeout of simple ack and pull order

Signed-off-by: wangxye <[email protected]>
AutoMQ · Nov 9, 2023 · 5a6d2e4 · 5a6d2e4
1 parent 998514d
commit 5a6d2e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/java/e2e-v4/src/test/java/org/apache/rocketmq/pull/PullOrderParamTest.java b/java/e2e-v4/src/test/java/org/apache/rocketmq/pull/PullOrderParamTest.java
@@ -73,7 +73,7 @@ public void testFIFO_pull_receive_nack() {
 
         RMQNormalConsumer consumer = ConsumerFactory.getRMQPullConsumer(namesrvAddr, groupId, rpcHook);
         consumer.startDefaultPull();
-        VerifyUtils.tryReceiveOnce(consumer.getPullConsumer(), topic, tag, 32);
+//        VerifyUtils.tryReceiveOnce(consumer.getPullConsumer(), topic, tag, 32);
         RMQNormalProducer producer = ProducerFactory.getRMQProducer(namesrvAddr, rpcHook);
         Assertions.assertNotNull(producer, "Get producer failed");
 
@@ -147,8 +147,9 @@ public void testFIFO_pull_receive_nack() {
             futures[mqCount++] = future;
         }
         try {
-            CompletableFuture.allOf(futures).get(60, TimeUnit.SECONDS);
+            CompletableFuture.allOf(futures).get(120, TimeUnit.SECONDS);
         } catch (Exception e) {
+            System.out.printf("exception occurred: %s%n", e.getCause());
             e.printStackTrace();
             Assertions.fail("receive response count not match");
         }

diff --git a/java/e2e/src/test/java/org/apache/rocketmq/broker/simple/SimpleAckTest.java b/java/e2e/src/test/java/org/apache/rocketmq/broker/simple/SimpleAckTest.java
@@ -98,7 +98,7 @@ public void testNormal_simple_receiveAsync_ack() {
         String groupId = getGroupId(methodName);
 
         SimpleConsumer consumer = ConsumerFactory.getSimpleConsumer(account, topic, groupId, new FilterExpression(tag), Duration.ofSeconds(10));
-        VerifyUtils.tryReceiveOnce(consumer);
+//        VerifyUtils.tryReceiveOnce(consumer);
 
         producer = ProducerFactory.getRMQProducer(account, topic);
         Assertions.assertNotNull(producer, "Get Producer failed");
@@ -120,7 +120,7 @@ public void testNormal_simple_receive_ackAsync() {
         String groupId = getGroupId(methodName);
 
         SimpleConsumer consumer = ConsumerFactory.getSimpleConsumer(account, topic, groupId, new FilterExpression(tag), Duration.ofSeconds(10));
-        VerifyUtils.tryReceiveOnce(consumer);
+//        VerifyUtils.tryReceiveOnce(consumer);
 
         producer = ProducerFactory.getRMQProducer(account, topic);
         Assertions.assertNotNull(producer, "Get Producer failed");
@@ -142,7 +142,7 @@ public void testNormal_simple_receiveAsync_ackAsync() {
         String groupId = getGroupId(methodName);
 
         SimpleConsumer consumer = ConsumerFactory.getSimpleConsumer(account, topic, groupId, new FilterExpression(tag), Duration.ofSeconds(10));
-        VerifyUtils.tryReceiveOnce(consumer);
+//        VerifyUtils.tryReceiveOnce(consumer);
 
         producer = ProducerFactory.getRMQProducer(account, topic);
         Assertions.assertNotNull(producer, "Get Producer failed");