Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] Pulsar spout fails to unsubscribe and close consumers on a shared subscription #56

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Pulsar spout fails to unsubscribe and close consumers on a shared subscription #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/kafka-streams/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar.examples</groupId>
<artifactId>pulsar-adapters-examples</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>kafka-streams</artifactId>
Expand All @@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</dependency>

<!-- Apache Kafka dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<groupId>org.apache.pulsar.examples</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar.examples</groupId>
<artifactId>pulsar-adapters-examples</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>spark</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>

<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>

<name>Pulsar Adapters</name>
<description>A collections of Pulsar adapters.</description>
Expand Down Expand Up @@ -76,7 +76,7 @@
</issueManagement>

<properties>
<pulsar.version>2.11.0</pulsar.version>
<pulsar.version>3.2.0-SNAPSHOT</pulsar.version>
<kafka-client.version>2.7.2</kafka-client.version>
<storm.version>2.0.0</storm.version>
<kafka_0_8.version>0.8.1.1</kafka_0_8.version>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-shaded_0_9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka-tests_0_9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka_0_8/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-client-kafka-compat/pulsar-client-kafka_0_9/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-kafka-compat</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 0 additions & 2 deletions ...nt-kafka_0_9/src/test/java/org/apache/kafka/clients/producer/PulsarKafkaProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.anyVararg;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
Expand All @@ -31,7 +30,6 @@

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion pulsar-log4j2-appender/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-storm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pulsar-storm/src/main/java/org/apache/pulsar/storm/PulsarSpout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public void close() throws PulsarClientException {

@Override
public void unsubscribe() throws PulsarClientException {
consumer.unsubscribe();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be better to split the actual fix from the version change. eg: first the version update and then using the new API

consumer.unsubscribe(true);
}

}
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-adapters</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>adapters-tests-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion tests/pulsar-kafka-compat-client-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>adapters-tests-parent</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>pulsar-kafka-compat-client-test</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions tests/pulsar-spark-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>adapters-tests-parent</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>pulsar-spark-test</artifactId>
Expand All @@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-spark</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions tests/pulsar-storm-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.pulsar.tests</groupId>
<artifactId>adapters-tests-parent</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
</parent>

<artifactId>pulsar-storm-test</artifactId>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-storm</artifactId>
<version>2.11.0-SNAPSHOT</version>
<version>3.2.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Loading