You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2020/06/02 07:52:15 UTC
[pulsar] branch master updated: fix NullPointerException with
SubscriptionMode.NonDurable (#7118)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 3a49ad5 fix NullPointerException with SubscriptionMode.NonDurable (#7118)
3a49ad5 is described below
commit 3a49ad5f6e2217bc56f4d8e9d159260337234c11
Author: feynmanlin <fe...@tencent.com>
AuthorDate: Tue Jun 2 15:52:02 2020 +0800
fix NullPointerException with SubscriptionMode.NonDurable (#7118)
Fixes #7046
### Motivation
This code is to enable non-persistent subscriptions to continue to consume， based on the Id of the first message in the client's ReceiverQueue when reconnection is triggered.
But it's not considered the case that there is no messageId for the first connection. Therefore, we need to determine whether the MessageId is null.
---
.../client/api/NonDurableSubscriptionTest.java | 82 ++++++++++++++++++++++
.../apache/pulsar/client/impl/ConsumerImpl.java | 6 +-
2 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java
new file mode 100644
index 0000000..5eb8085
--- /dev/null
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonDurableSubscriptionTest.java
@@ -0,0 +1,82 @@
+/**
+ * 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.client.api;
+
+import java.util.concurrent.TimeUnit;
+
+import lombok.Cleanup;
+import org.apache.pulsar.client.impl.ConsumerImpl;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+public class NonDurableSubscriptionTest extends ProducerConsumerBase {
+
+ @BeforeMethod
+ @Override
+ protected void setup() throws Exception {
+ super.internalSetup();
+ super.producerBaseSetup();
+ }
+
+ @AfterMethod
+ @Override
+ protected void cleanup() throws Exception {
+ super.internalCleanup();
+ }
+
+ @Test
+ public void testNonDurableSubscription() throws Exception {
+ String topicName = "persistent://my-property/my-ns/nonDurable-topic1";
+ // 1 setup producer、consumer
+ @Cleanup
+ Producer<String> producer = pulsarClient.newProducer(Schema.STRING).topic(topicName)
+ .create();
+ @Cleanup
+ Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING).topic(topicName)
+ .readCompacted(true)
+ .subscriptionMode(SubscriptionMode.NonDurable)
+ .subscriptionType(SubscriptionType.Exclusive)
+ .subscriptionName("my-nonDurable-subscriber")
+ .subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
+ .subscribe();
+ // 2 send message
+ int messageNum = 10;
+ for (int i = 0; i < messageNum; i++) {
+ producer.send("message" + i);
+ }
+ // 3 receive the first 5 messages
+ for (int i = 0; i < 5; i++) {
+ Message<String> message = consumer.receive(1, TimeUnit.SECONDS);
+ Assert.assertNotNull(message);
+ Assert.assertEquals(message.getValue(), "message" + i);
+ consumer.acknowledge(message);
+ }
+ // 4 trigger reconnect
+ ((ConsumerImpl)consumer).getClientCnx().close();
+ // 5 for non-durable we are going to restart from the next entry
+ for (int i = 5; i < messageNum; i++) {
+ Message<String> message = consumer.receive(3, TimeUnit.SECONDS);
+ Assert.assertNotNull(message);
+ Assert.assertEquals(message.getValue(), "message" + i);
+ }
+
+ }
+}
diff --git a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
index d573d82..11d9c19 100644
--- a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
+++ b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
@@ -745,11 +745,11 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle
}
boolean isDurable = subscriptionMode == SubscriptionMode.Durable;
- MessageIdData startMessageIdData;
+ MessageIdData startMessageIdData = null;
if (isDurable) {
// For regular durable subscriptions, the message id from where to restart will be determined by the broker.
startMessageIdData = null;
- } else {
+ } else if (startMessageId != null) {
// For non-durable we are going to restart from the next entry
MessageIdData.Builder builder = MessageIdData.newBuilder();
builder.setLedgerId(startMessageId.getLedgerId());
@@ -769,7 +769,7 @@ public class ConsumerImpl<T> extends ConsumerBase<T> implements ConnectionHandle
}
// startMessageRollbackDurationInSec should be consider only once when consumer connects to first time
long startMessageRollbackDuration = (startMessageRollbackDurationInSec > 0
- && startMessageId.equals(initialStartMessageId)) ? startMessageRollbackDurationInSec : 0;
+ && startMessageId != null && startMessageId.equals(initialStartMessageId)) ? startMessageRollbackDurationInSec : 0;
ByteBuf request = Commands.newSubscribe(topic, subscription, consumerId, requestId, getSubType(), priorityLevel,
consumerName, isDurable, startMessageIdData, metadata, readCompacted,
conf.isReplicateSubscriptionState(), InitialPosition.valueOf(subscriptionInitialPosition.getValue()),