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

PIP-13-3/3: auto subscribe based on regex pattern topics changing #1175

Closed
wants to merge 7 commits into from
Closed

PIP-13-3/3: auto subscribe based on regex pattern topics changing #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de6e4ee
add TopicsConsumerImpl and some test
jiazhai Jan 24, 2018
a34ef4d
fix license header check, add get method, and fix unit-test fail
jiazhai Jan 26, 2018
43242c7
add subscribe and unsubscribe for one topic, add tests
jiazhai Jan 31, 2018
af5d6d0
change to use subscribeAsync(topic) to subscribe topics in init
jiazhai Feb 4, 2018
6132aee
leverage lookup service to getTopicsOfNamespace, add subscribe patter…
jiazhai Feb 1, 2018
ff4bc1a
change method following PIP-12, add more methods for pattern sub in c…
jiazhai Feb 5, 2018
deab2e1
auto discovery of pattern subscribe topics changes; auto sub/unsub
jiazhai Feb 5, 2018
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
31 changes: 31 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.apache.pulsar.common.api.proto.PulsarApi.ProtocolVersion.v5;

import java.net.SocketAddress;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Semaphore;
Expand All @@ -40,6 +41,7 @@
import org.apache.pulsar.broker.PulsarServerException;
import org.apache.pulsar.broker.authentication.AuthenticationDataCommand;
import org.apache.pulsar.broker.service.BrokerServiceException.ConsumerBusyException;
import org.apache.pulsar.broker.service.BrokerServiceException.ServerMetadataException;
import org.apache.pulsar.broker.service.BrokerServiceException.ServiceUnitNotReadyException;
import org.apache.pulsar.broker.web.RestException;
import org.apache.pulsar.client.api.PulsarClientException;
Expand All @@ -56,6 +58,7 @@
import org.apache.pulsar.common.api.proto.PulsarApi.CommandConsumerStats;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandConsumerStatsResponse;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandFlow;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandGetTopicsOfNamespace;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandLookupTopic;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandPartitionedTopicMetadata;
import org.apache.pulsar.common.api.proto.PulsarApi.CommandProducer;
Expand Down Expand Up @@ -967,6 +970,34 @@ protected void handleCloseConsumer(CommandCloseConsumer closeConsumer) {
}
}

@Override
protected void handleGetTopicsOfNamespace(CommandGetTopicsOfNamespace commandGetTopicsOfNamespace) {
final long requestId = commandGetTopicsOfNamespace.getRequestId();
final String property = commandGetTopicsOfNamespace.getProperty();
final String cluster = commandGetTopicsOfNamespace.getCluster();
final String localName = commandGetTopicsOfNamespace.getLocalName();

try {
List<String> topics = getBrokerService().pulsar()
.getNamespaceService()
.getListOfDestinations(property, cluster, localName);

if (log.isDebugEnabled()) {
log.debug("[{}] Received CommandGetTopicsOfNamespace for namespace [//{}/{}/{}] by {}, size:{}",
remoteAddress, property, cluster, localName, requestId, topics.size());
}

ctx.writeAndFlush(Commands.newGetTopicsOfNamespaceResponse(topics, requestId));
} catch (Exception e) {
log.warn("[{]] Error GetTopicsOfNamespace for namespace [//{}/{}/{}] by {}",
remoteAddress, property, cluster, localName, requestId);
ctx.writeAndFlush(
Commands.newError(requestId,
BrokerServiceException.getClientErrorCode(new ServerMetadataException(e)),
e.getMessage()));
}
}

@Override
protected boolean isHandshakeCompleted() {
return state == State.Connected;
Expand Down
4 changes: 2 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentQueueE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,11 +539,11 @@ public void testUnackedCountWithRedeliveries() throws Exception {
producer.send(("hello-" + i).getBytes());
}

Set<MessageIdImpl> c1_receivedMessages = new HashSet<>();
Set<MessageId> c1_receivedMessages = new HashSet<>();

// C-1 gets all messages but doesn't ack
for (int i = 0; i < numMsgs; i++) {
c1_receivedMessages.add((MessageIdImpl) consumer1.receive().getMessageId());
c1_receivedMessages.add(consumer1.receive().getMessageId());
}

// C-2 will not get any message initially, since everything went to C-1 already
Expand Down
469 changes: 469 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/PatternTopicsConsumerImplTest.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading