You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2021/03/29 15:24:24 UTC
[GitHub] [pulsar] gaoran10 opened a new pull request #10078: [Messaging] Fix delay message block
gaoran10 opened a new pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078
Based on the PR https://github.com/apache/pulsar/pull/10077
### Motivation
Currently, in the docker environment, if the consumer enables the retry feature and sets the retry topic in DeadLetterPolicy, the consumer will be blocked after receive retry messages many times.
### Modifications
change the hasMessageAvailable check for delay messages
### Verifying this change
Add an integration test.
### Does this pull request potentially affect one of the following parts:
*If `yes` was chosen, please highlight the changes*
- Dependencies (does it add or upgrade a dependency): (yes / no)
- The public API: (yes / no)
- The schema: (yes / no / don't know)
- The default values of configurations: (yes / no)
- The wire protocol: (yes / no)
- The rest endpoints: (yes / no)
- The admin cli options: (yes / no)
- Anything that affects deployment: (yes / no / don't know)
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a followup issue for adding the documentation
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] 315157973 commented on a change in pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
315157973 commented on a change in pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#discussion_r604202352
##########
File path: tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
##########
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.messaging;
+
+import java.util.concurrent.TimeUnit;
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.DeadLetterPolicy;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Delay messaging test.
+ */
+@Slf4j
+public class DelayMessagingTest extends PulsarTestSuite {
+
+ @Test(dataProvider = "ServiceUrls")
+ public void delayMsgBlockTest(String serviceUrl) throws Exception {
+ String nsName = generateNamespaceName();
+ pulsarCluster.createNamespace(nsName);
+
+ String topic = generateTopicName(nsName, "testDelayMsgBlock", true);
+ pulsarCluster.createPartitionedTopic(topic, 3);
+
+ String retryTopic = topic + "-RETRY";
+ String deadLetterTopic = topic + "-DLT";
+
+ @Cleanup
+ PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(serviceUrl).build();
+
+ @Cleanup
+ Producer<byte[]> producer = pulsarClient.newProducer()
+ .topic(topic)
+ .create();
+
+ final int redeliverCnt = 10;
+ final int delayTimeSeconds = 10;
Review comment:
Now that the integration test has been taking a long time, can we reduce the time here?
Later `receive message at first time` will use more than 100 seconds
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on a change in pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on a change in pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#discussion_r605461550
##########
File path: tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
##########
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.messaging;
+
+import java.util.concurrent.TimeUnit;
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.DeadLetterPolicy;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Delay messaging test.
+ */
+@Slf4j
+public class DelayMessagingTest extends PulsarTestSuite {
+
+ @Test(dataProvider = "ServiceUrls")
+ public void delayMsgBlockTest(String serviceUrl) throws Exception {
+ String nsName = generateNamespaceName();
+ pulsarCluster.createNamespace(nsName);
+
+ String topic = generateTopicName(nsName, "testDelayMsgBlock", true);
+ pulsarCluster.createPartitionedTopic(topic, 3);
+
+ String retryTopic = topic + "-RETRY";
+ String deadLetterTopic = topic + "-DLT";
+
+ @Cleanup
+ PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(serviceUrl).build();
+
+ @Cleanup
+ Producer<byte[]> producer = pulsarClient.newProducer()
+ .topic(topic)
+ .create();
+
+ final int redeliverCnt = 10;
+ final int delayTimeSeconds = 10;
+ @Cleanup
+ Consumer<byte[]> consumer = pulsarClient.newConsumer()
+ .topic(topic)
+ .subscriptionName("test")
+ .subscriptionType(SubscriptionType.Shared)
+ .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+ .enableRetry(true)
+ .deadLetterPolicy(DeadLetterPolicy.builder()
+ .maxRedeliverCount(redeliverCnt)
+ .retryLetterTopic(retryTopic)
+ .deadLetterTopic(deadLetterTopic)
+ .build())
+ .receiverQueueSize(100)
+ .ackTimeout(60, TimeUnit.SECONDS)
+ .subscribe();
+
+ producer.newMessage().value("hello".getBytes()).send();
+
+ // receive message at first time
+ Message<byte[]> message = consumer.receive(delayTimeSeconds * 2, TimeUnit.SECONDS);
+ Assert.assertNotNull(message, "Can't receive message at the first time.");
+ consumer.reconsumeLater(message, delayTimeSeconds, TimeUnit.SECONDS);
+
+ // receive retry messages
+ for (int i = 0; i < redeliverCnt; i++) {
+ message = consumer.receive(delayTimeSeconds * 2, TimeUnit.SECONDS);
+ Assert.assertNotNull(message, "Consumer can't receive message in double delayTimeSeconds time "
+ + delayTimeSeconds * 2 + "s");
+ log.info("receive msg. reConsumeTimes: {}", message.getProperty("RECONSUMETIMES"));
+ consumer.reconsumeLater(message, delayTimeSeconds, TimeUnit.SECONDS);
+ }
+
+ @Cleanup
+ Consumer<byte[]> dltConsumer = pulsarClient.newConsumer()
+ .topic(deadLetterTopic)
+ .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+ .subscriptionName("test")
+ .subscribe();
+
+ message = dltConsumer.receive(10, TimeUnit.SECONDS);
Review comment:
Normally, we could receive messages from the dead letter topic.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#issuecomment-816432212
/pulsarbot run-failure-checks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] eolivelli commented on a change in pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
eolivelli commented on a change in pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#discussion_r604098482
##########
File path: tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
##########
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.messaging;
+
+import java.util.concurrent.TimeUnit;
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.DeadLetterPolicy;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Delay messaging test.
+ */
+@Slf4j
+public class DelayMessagingTest extends PulsarTestSuite {
+
+ @Test(dataProvider = "ServiceUrls")
+ public void delayMsgBlockTest(String serviceUrl) throws Exception {
+ String nsName = generateNamespaceName();
+ pulsarCluster.createNamespace(nsName);
+
+ String topic = generateTopicName(nsName, "testDelayMsgBlock", true);
+ pulsarCluster.createPartitionedTopic(topic, 3);
+
+ String retryTopic = topic + "-RETRY";
+ String deadLetterTopic = topic + "-DLT";
+
+ @Cleanup
+ PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(serviceUrl).build();
+
+ @Cleanup
+ Producer<byte[]> producer = pulsarClient.newProducer()
+ .topic(topic)
+ .create();
+
+ final int redeliverCnt = 10;
+ final int delayTimeSeconds = 10;
+ @Cleanup
+ Consumer<byte[]> consumer = pulsarClient.newConsumer()
+ .topic(topic)
+ .subscriptionName("test")
+ .subscriptionType(SubscriptionType.Shared)
+ .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+ .enableRetry(true)
+ .deadLetterPolicy(DeadLetterPolicy.builder()
+ .maxRedeliverCount(redeliverCnt)
+ .retryLetterTopic(retryTopic)
+ .deadLetterTopic(deadLetterTopic)
+ .build())
+ .receiverQueueSize(100)
+ .ackTimeout(60, TimeUnit.SECONDS)
+ .subscribe();
+
+ producer.newMessage().value("hello".getBytes()).send();
+
+ // receive message at first time
+ Message<byte[]> message = consumer.receive(delayTimeSeconds * 2, TimeUnit.SECONDS);
+ Assert.assertNotNull(message, "Can't receive message at the first time.");
+ consumer.reconsumeLater(message, delayTimeSeconds, TimeUnit.SECONDS);
+
+ // receive retry messages
+ for (int i = 0; i < redeliverCnt; i++) {
+ message = consumer.receive(delayTimeSeconds * 2, TimeUnit.SECONDS);
+ Assert.assertNotNull(message, "Consumer can't receive message in double delayTimeSeconds time "
+ + delayTimeSeconds * 2 + "s");
+ log.info("receive msg. reConsumeTimes: {}", message.getProperty("RECONSUMETIMES"));
+ consumer.reconsumeLater(message, delayTimeSeconds, TimeUnit.SECONDS);
+ }
+
+ @Cleanup
+ Consumer<byte[]> dltConsumer = pulsarClient.newConsumer()
+ .topic(deadLetterTopic)
+ .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+ .subscriptionName("test")
+ .subscribe();
+
+ message = dltConsumer.receive(10, TimeUnit.SECONDS);
Review comment:
is there a way to not rely on this timeout ?
I am afraid we are going to add a new flaky test
cc @lhotari
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] codelipenghui merged pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
codelipenghui merged pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on a change in pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on a change in pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#discussion_r605457508
##########
File path: tests/integration/src/test/java/org/apache/pulsar/tests/integration/messaging/DelayMessagingTest.java
##########
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.pulsar.tests.integration.messaging;
+
+import java.util.concurrent.TimeUnit;
+import lombok.Cleanup;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.pulsar.client.api.Consumer;
+import org.apache.pulsar.client.api.DeadLetterPolicy;
+import org.apache.pulsar.client.api.Message;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.SubscriptionInitialPosition;
+import org.apache.pulsar.client.api.SubscriptionType;
+import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ * Delay messaging test.
+ */
+@Slf4j
+public class DelayMessagingTest extends PulsarTestSuite {
+
+ @Test(dataProvider = "ServiceUrls")
+ public void delayMsgBlockTest(String serviceUrl) throws Exception {
+ String nsName = generateNamespaceName();
+ pulsarCluster.createNamespace(nsName);
+
+ String topic = generateTopicName(nsName, "testDelayMsgBlock", true);
+ pulsarCluster.createPartitionedTopic(topic, 3);
+
+ String retryTopic = topic + "-RETRY";
+ String deadLetterTopic = topic + "-DLT";
+
+ @Cleanup
+ PulsarClient pulsarClient = PulsarClient.builder().serviceUrl(serviceUrl).build();
+
+ @Cleanup
+ Producer<byte[]> producer = pulsarClient.newProducer()
+ .topic(topic)
+ .create();
+
+ final int redeliverCnt = 10;
+ final int delayTimeSeconds = 10;
Review comment:
I reduce the delay timeout to 5, thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#issuecomment-809978465
This PR based on the PR https://github.com/apache/pulsar/pull/10077.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#issuecomment-811727301
/pulsarbot run-failure-checks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [pulsar] gaoran10 commented on pull request #10078: [Messaging] Fix delay message block
Posted by GitBox <gi...@apache.org>.
gaoran10 commented on pull request #10078:
URL: https://github.com/apache/pulsar/pull/10078#issuecomment-812291210
/pulsarbot run-failure-checks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org