From 5a6d2e4838c166a1e97e90055fda41f89320452f Mon Sep 17 00:00:00 2001 From: wangxye Date: Thu, 9 Nov 2023 11:50:19 +0800 Subject: [PATCH] fix: fix the receive timeout of simple ack and pull order Signed-off-by: wangxye --- .../java/org/apache/rocketmq/pull/PullOrderParamTest.java | 5 +++-- .../org/apache/rocketmq/broker/simple/SimpleAckTest.java | 6 +++--- 2 files changed, 6 insertions(+), 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 index ce248bb..bdea36a 100644 --- 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 index 4c6e101..81ccfda 100644 --- 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");