forked from apache/pulsar
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support partitioned topics in the Reader (apache#7518)
Fixes apache#3643 apache#7265 ### Motivation Support partitioned topics in the Reader ### Modifications class relationship: PulsarClientImpl -> MultiTopicsReaderImpl -> MultiTopicsConsumerImpl -> ConsumerImpl PulsarClientImpl support build MultiTopicsReader MultiTopicsReader wraps one MultiTopicsConsumerImpl MultiTopicsConsumerImpl contains multiple consumerImpl Make MultiTopicsConsumerImpl support seek by messageId seek by time: All consumerImpl seek by time, Reader can get all the messages returned by each partition seek by message: 1)When seek by latest/earliest,all partitions seek by latest/earliest,Reader can get all the messages returned by each partition 2)When the messageId contains explicit partition information, it will only receive messages from this partition, and will not receive messages from other partitions.To avoid other partitions returning messages in inclusive mode, I make other consumer seek to latest and add a ignoredConsumersSet to ignore messages from other partitions .
- Loading branch information
1 parent
fe08986
commit 8b946de
Showing
8 changed files
with
1,203 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
507 changes: 506 additions & 1 deletion
507
pulsar-broker/src/test/java/org/apache/pulsar/client/api/TopicReaderTest.java
Large diffs are not rendered by default.
Oops, something went wrong.
373 changes: 373 additions & 0 deletions
373
pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,373 @@ | ||
/** | ||
* 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.impl; | ||
|
||
import java.io.IOException; | ||
import java.util.ArrayList; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Set; | ||
import java.util.concurrent.Future; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import com.google.common.collect.Lists; | ||
import com.google.common.collect.Sets; | ||
import lombok.Cleanup; | ||
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; | ||
import org.apache.pulsar.broker.service.StickyKeyConsumerSelector; | ||
import org.apache.pulsar.client.admin.PulsarAdminException; | ||
import org.apache.pulsar.client.api.Message; | ||
import org.apache.pulsar.client.api.MessageId; | ||
import org.apache.pulsar.client.api.MessageRoutingMode; | ||
import org.apache.pulsar.client.api.Producer; | ||
import org.apache.pulsar.client.api.ProducerBuilder; | ||
import org.apache.pulsar.client.api.Range; | ||
import org.apache.pulsar.client.api.Reader; | ||
import org.apache.pulsar.client.api.Schema; | ||
import org.apache.pulsar.common.api.proto.PulsarApi; | ||
import org.apache.pulsar.common.policies.data.ClusterData; | ||
import org.apache.pulsar.common.policies.data.PersistentTopicInternalStats; | ||
import org.apache.pulsar.common.policies.data.RetentionPolicies; | ||
import org.apache.pulsar.common.policies.data.TenantInfo; | ||
import org.apache.pulsar.common.util.Murmur3_32Hash; | ||
import org.testng.Assert; | ||
import org.testng.annotations.AfterMethod; | ||
import org.testng.annotations.BeforeMethod; | ||
import org.testng.annotations.Test; | ||
|
||
import static org.testng.Assert.assertEquals; | ||
import static org.testng.Assert.assertFalse; | ||
import static org.testng.Assert.assertTrue; | ||
import static org.testng.Assert.fail; | ||
|
||
public class MultiTopicsReaderTest extends MockedPulsarServiceBaseTest { | ||
|
||
private static final String subscription = "reader-multi-topics-sub"; | ||
|
||
@BeforeMethod | ||
@Override | ||
protected void setup() throws Exception { | ||
super.internalSetup(); | ||
|
||
admin.clusters().createCluster("test", | ||
new ClusterData(pulsar.getWebServiceAddress())); | ||
admin.tenants().createTenant("my-property", | ||
new TenantInfo(Sets.newHashSet("appid1", "appid2"), Sets.newHashSet("test"))); | ||
admin.namespaces().createNamespace("my-property/my-ns", Sets.newHashSet("test")); | ||
} | ||
|
||
@AfterMethod | ||
@Override | ||
protected void cleanup() throws Exception { | ||
super.internalCleanup(); | ||
} | ||
|
||
@Test(timeOut = 30000) | ||
public void testReadMessageWithoutBatching() throws Exception { | ||
String topic = "persistent://my-property/my-ns/my-reader-topic"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
testReadMessages(topic, false); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testReadMessageWithoutBatchingWithMessageInclusive() throws Exception { | ||
String topic = "persistent://my-property/my-ns/my-reader-topic-inclusive"; | ||
int topicNum = 3; | ||
admin.topics().createPartitionedTopic(topic, topicNum); | ||
Set<String> keys = publishMessages(topic, 10, false); | ||
|
||
Reader<byte[]> reader = pulsarClient.newReader().topic(topic).startMessageId(MessageId.latest) | ||
.startMessageIdInclusive().readerName(subscription).create(); | ||
int count = 0; | ||
while (reader.hasMessageAvailable()) { | ||
Assert.assertTrue(keys.remove(reader.readNext(1, TimeUnit.SECONDS).getKey())); | ||
count++; | ||
} | ||
Assert.assertEquals(count, topicNum); | ||
Assert.assertFalse(reader.hasMessageAvailable()); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testReadMessageWithBatching() throws Exception { | ||
String topic = "persistent://my-property/my-ns/my-reader-topic-with-batching"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
testReadMessages(topic, true); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testReadMessageWithBatchingWithMessageInclusive() throws Exception { | ||
String topic = "persistent://my-property/my-ns/my-reader-topic-with-batching-inclusive"; | ||
int topicNum = 3; | ||
int msgNum = 15; | ||
admin.topics().createPartitionedTopic(topic, topicNum); | ||
Set<String> keys = publishMessages(topic, msgNum, true); | ||
|
||
Reader<byte[]> reader = pulsarClient.newReader().topic(topic).startMessageId(MessageId.latest) | ||
.startMessageIdInclusive().readerName(subscription).create(); | ||
|
||
while (reader.hasMessageAvailable()) { | ||
Assert.assertTrue(keys.remove(reader.readNext(2, TimeUnit.SECONDS).getKey())); | ||
} | ||
// start from latest with start message inclusive should only read the last 3 message from 3 partition | ||
Assert.assertEquals(keys.size(), msgNum - topicNum); | ||
Assert.assertFalse(keys.contains("key14")); | ||
Assert.assertFalse(keys.contains("key13")); | ||
Assert.assertFalse(keys.contains("key12")); | ||
Assert.assertFalse(reader.hasMessageAvailable()); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testReaderWithTimeLong() throws Exception { | ||
String ns = "my-property/my-ns"; | ||
String topic = "persistent://" + ns + "/testReadFromPartition"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
RetentionPolicies retention = new RetentionPolicies(-1, -1); | ||
admin.namespaces().setRetention(ns, retention); | ||
|
||
ProducerBuilder<byte[]> produceBuilder = pulsarClient.newProducer(); | ||
produceBuilder.topic(topic); | ||
produceBuilder.enableBatching(false); | ||
Producer<byte[]> producer = produceBuilder.create(); | ||
int totalMsg = 10; | ||
// (1) Publish 10 messages with publish-time 5 HOUR back | ||
long oldMsgPublishTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(5); // 5 hours old | ||
for (int i = 0; i < totalMsg; i++) { | ||
TypedMessageBuilderImpl<byte[]> msg = (TypedMessageBuilderImpl<byte[]>) producer.newMessage() | ||
.value(("old" + i).getBytes()); | ||
PulsarApi.MessageMetadata.Builder metadataBuilder = msg.getMetadataBuilder(); | ||
metadataBuilder.setPublishTime(oldMsgPublishTime).setSequenceId(i); | ||
metadataBuilder.setProducerName(producer.getProducerName()).setReplicatedFrom("us-west1"); | ||
} | ||
|
||
// (2) Publish 10 messages with publish-time 1 HOUR back | ||
long newMsgPublishTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1); // 1 hour old | ||
MessageId firstMsgId = null; | ||
for (int i = 0; i < totalMsg; i++) { | ||
TypedMessageBuilderImpl<byte[]> msg = (TypedMessageBuilderImpl<byte[]>) producer.newMessage() | ||
.value(("new" + i).getBytes()); | ||
PulsarApi.MessageMetadata.Builder metadataBuilder = msg.getMetadataBuilder(); | ||
metadataBuilder.setPublishTime(newMsgPublishTime); | ||
metadataBuilder.setProducerName(producer.getProducerName()).setReplicatedFrom("us-west1"); | ||
MessageId msgId = msg.send(); | ||
if (firstMsgId == null) { | ||
firstMsgId = msgId; | ||
} | ||
} | ||
|
||
// (3) Create reader and set position 1 hour back so, it should only read messages which are 2 hours old which | ||
// published on step 2 | ||
Reader<byte[]> reader = pulsarClient.newReader().topic(topic) | ||
.startMessageFromRollbackDuration(2, TimeUnit.HOURS).create(); | ||
|
||
List<MessageId> receivedMessageIds = Lists.newArrayList(); | ||
|
||
while (reader.hasMessageAvailable()) { | ||
Message<byte[]> msg = reader.readNext(1, TimeUnit.SECONDS); | ||
if (msg == null) { | ||
break; | ||
} | ||
receivedMessageIds.add(msg.getMessageId()); | ||
} | ||
|
||
assertEquals(receivedMessageIds.size(), totalMsg); | ||
|
||
restartBroker(); | ||
|
||
assertFalse(reader.hasMessageAvailable()); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testRemoveSubscriptionForReaderNeedRemoveCursor() throws IOException, PulsarAdminException { | ||
|
||
final String topic = "persistent://my-property/my-ns/testRemoveSubscriptionForReaderNeedRemoveCursor"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
@Cleanup | ||
Reader<byte[]> reader1 = pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.create(); | ||
|
||
@Cleanup | ||
Reader<byte[]> reader2 = pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.create(); | ||
|
||
Assert.assertEquals(admin.topics().getSubscriptions(topic).size(), 2); | ||
for (PersistentTopicInternalStats value : admin.topics().getPartitionedInternalStats(topic).partitions.values()) { | ||
Assert.assertEquals(value.cursors.size(), 2); | ||
} | ||
|
||
reader1.close(); | ||
|
||
Assert.assertEquals(admin.topics().getSubscriptions(topic).size(), 1); | ||
for (PersistentTopicInternalStats value : admin.topics().getPartitionedInternalStats(topic).partitions.values()) { | ||
Assert.assertEquals(value.cursors.size(), 1); | ||
} | ||
|
||
reader2.close(); | ||
|
||
Assert.assertEquals(admin.topics().getSubscriptions(topic).size(), 0); | ||
for (PersistentTopicInternalStats value : admin.topics().getPartitionedInternalStats(topic).partitions.values()) { | ||
Assert.assertEquals(value.cursors.size(), 0); | ||
} | ||
|
||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testMultiReaderSeek() throws Exception { | ||
String topic = "persistent://my-property/my-ns/testKeyHashRangeReader"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
Set<String> ids = publishMessages(topic,100,false); | ||
List<String> idList = new ArrayList<>(ids); | ||
Collections.sort(idList); | ||
} | ||
|
||
@Test(timeOut = 10000) | ||
public void testKeyHashRangeReader() throws Exception { | ||
final List<String> keys = Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9"); | ||
final String topic = "persistent://my-property/my-ns/testKeyHashRangeReader"; | ||
admin.topics().createPartitionedTopic(topic, 3); | ||
|
||
try { | ||
pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.keyHashRange(Range.of(0, 10000), Range.of(8000, 12000)) | ||
.create(); | ||
fail("should failed with unexpected key hash range"); | ||
} catch (IllegalArgumentException e) { | ||
} | ||
|
||
try { | ||
pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.keyHashRange(Range.of(30000, 20000)) | ||
.create(); | ||
fail("should failed with unexpected key hash range"); | ||
} catch (IllegalArgumentException e) { | ||
} | ||
|
||
try { | ||
pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.keyHashRange(Range.of(80000, 90000)) | ||
.create(); | ||
fail("should failed with unexpected key hash range"); | ||
} catch (IllegalArgumentException e) { | ||
} | ||
|
||
@Cleanup | ||
Reader<String> reader = pulsarClient.newReader(Schema.STRING) | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.keyHashRange(Range.of(0, StickyKeyConsumerSelector.DEFAULT_RANGE_SIZE / 2)) | ||
.create(); | ||
|
||
@Cleanup | ||
Producer<String> producer = pulsarClient.newProducer(Schema.STRING) | ||
.topic(topic) | ||
.enableBatching(false) | ||
.create(); | ||
|
||
int expectedMessages = 0; | ||
for (String key : keys) { | ||
int slot = Murmur3_32Hash.getInstance().makeHash(key.getBytes()) | ||
% StickyKeyConsumerSelector.DEFAULT_RANGE_SIZE; | ||
if (slot <= StickyKeyConsumerSelector.DEFAULT_RANGE_SIZE / 2) { | ||
expectedMessages++; | ||
} | ||
producer.newMessage() | ||
.key(key) | ||
.value(key) | ||
.send(); | ||
} | ||
|
||
List<String> receivedMessages = new ArrayList<>(); | ||
|
||
Message<String> msg; | ||
do { | ||
msg = reader.readNext(1, TimeUnit.SECONDS); | ||
if (msg != null) { | ||
receivedMessages.add(msg.getValue()); | ||
} | ||
} while (msg != null); | ||
|
||
assertTrue(expectedMessages > 0); | ||
assertEquals(receivedMessages.size(), expectedMessages); | ||
for (String receivedMessage : receivedMessages) { | ||
assertTrue(Integer.valueOf(receivedMessage) <= StickyKeyConsumerSelector.DEFAULT_RANGE_SIZE / 2); | ||
} | ||
|
||
} | ||
|
||
private void testReadMessages(String topic, boolean enableBatch) throws Exception { | ||
int numKeys = 9; | ||
|
||
Set<String> keys = publishMessages(topic, numKeys, enableBatch); | ||
Reader<byte[]> reader = pulsarClient.newReader() | ||
.topic(topic) | ||
.startMessageId(MessageId.earliest) | ||
.readerName(subscription) | ||
.create(); | ||
|
||
while (reader.hasMessageAvailable()) { | ||
Message<byte[]> message = reader.readNext(); | ||
Assert.assertTrue(keys.remove(message.getKey())); | ||
} | ||
Assert.assertEquals(keys.size(), 0); | ||
|
||
Reader<byte[]> readLatest = pulsarClient.newReader().topic(topic).startMessageId(MessageId.latest) | ||
.readerName(subscription + "latest").create(); | ||
Assert.assertFalse(readLatest.hasMessageAvailable()); | ||
} | ||
|
||
private Set<String> publishMessages(String topic, int count, boolean enableBatch) throws Exception { | ||
Set<String> keys = new HashSet<>(); | ||
ProducerBuilder<byte[]> builder = pulsarClient.newProducer(); | ||
builder.messageRoutingMode(MessageRoutingMode.RoundRobinPartition); | ||
builder.maxPendingMessages(count); | ||
// disable periodical flushing | ||
builder.batchingMaxPublishDelay(1, TimeUnit.DAYS); | ||
builder.topic(topic); | ||
if (enableBatch) { | ||
builder.enableBatching(true); | ||
builder.batchingMaxMessages(count); | ||
} else { | ||
builder.enableBatching(false); | ||
} | ||
try (Producer<byte[]> producer = builder.create()) { | ||
Future<?> lastFuture = null; | ||
for (int i = 0; i < count; i++) { | ||
String key = "key"+i; | ||
byte[] data = ("my-message-" + i).getBytes(); | ||
lastFuture = producer.newMessage().key(key).value(data).sendAsync(); | ||
keys.add(key); | ||
} | ||
producer.flush(); | ||
lastFuture.get(); | ||
} | ||
return keys; | ||
} | ||
|
||
} |
Oops, something went wrong.