[pulsar-broker] Optimize message replay for large backlog consumer #3732
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
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,125 @@ | ||
| /** | ||
| * 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.Set; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.apache.pulsar.client.impl.ConsumerImpl; | ||
| import org.apache.pulsar.client.impl.MessageIdImpl; | ||
| import org.testng.annotations.AfterClass; | ||
| import org.testng.annotations.BeforeClass; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import com.google.common.collect.Sets; | ||
|
|
||
| import static org.testng.Assert.assertTrue; | ||
| import static org.testng.Assert.assertEquals; | ||
|
|
||
| public class ConsumerRedeliveryTest extends ProducerConsumerBase { | ||
| @BeforeClass | ||
| @Override | ||
| protected void setup() throws Exception { | ||
| super.internalSetup(); | ||
| super.producerBaseSetup(); | ||
| } | ||
|
|
||
| @AfterClass | ||
| @Override | ||
| protected void cleanup() throws Exception { | ||
| super.internalCleanup(); | ||
| } | ||
|
|
||
| /** | ||
| * It verifies that redelivered messages are sorted based on the ledger-ids. | ||
| * <pre> | ||
| * 1. client publishes 100 messages across 50 ledgers | ||
| * 2. broker deliveres 100 messages to consumer | ||
| * 3. consumer ack every alternative message and doesn't ack 50 messsages | ||
| * 4. broker sorts replay messages based on ledger and redelivers messages ledger by ledger | ||
| * </pre> | ||
| * @throws Exception | ||
| */ | ||
| @Test | ||
| public void testOrderedRedelivery() throws Exception { | ||
| String topic = "persistent://my-property/my-ns/redelivery"; | ||
|
|
||
| conf.setManagedLedgerMaxEntriesPerLedger(2); | ||
| conf.setManagedLedgerMinLedgerRolloverTimeMinutes(0); | ||
|
|
||
| ProducerBuilder<byte[]> producerBuilder = pulsarClient.newProducer().topic(topic) | ||
| .producerName("my-producer-name"); | ||
| Producer<byte[]> producer = producerBuilder.create(); | ||
| ConsumerBuilder<byte[]> consumerBuilder = pulsarClient.newConsumer().topic(topic).subscriptionName("s1") | ||
| .subscriptionType(SubscriptionType.Shared); | ||
| ConsumerImpl<byte[]> consumer1 = (ConsumerImpl<byte[]>) consumerBuilder.subscribe(); | ||
|
|
||
| final int totalMsgs = 100; | ||
|
|
||
| for (int i = 0; i < totalMsgs; i++) { | ||
| String message = "my-message-" + i; | ||
| producer.send(message.getBytes()); | ||
| } | ||
|
|
||
|
|
||
| int consumedCount = 0; | ||
| Set<MessageId> messageIds = Sets.newHashSet(); | ||
| for (int i = 0; i < totalMsgs; i++) { | ||
| Message<byte[]> message = consumer1.receive(5, TimeUnit.SECONDS); | ||
| if (message != null && (consumedCount % 2) == 0) { | ||
| consumer1.acknowledge(message); | ||
| } else { | ||
| messageIds.add(message.getMessageId()); | ||
| } | ||
| consumedCount += 1; | ||
| } | ||
| assertEquals(totalMsgs, consumedCount); | ||
|
|
||
| // redeliver all unack messages | ||
| consumer1.redeliverUnacknowledgedMessages(messageIds); | ||
|
|
||
| MessageIdImpl lastMsgId = null; | ||
| for (int i = 0; i < totalMsgs / 2; i++) { | ||
| Message<byte[]> message = consumer1.receive(5, TimeUnit.SECONDS); | ||
| MessageIdImpl msgId = (MessageIdImpl) message.getMessageId(); | ||
| if (lastMsgId != null) { | ||
| assertTrue(lastMsgId.getLedgerId() <= msgId.getLedgerId()); | ||
| } | ||
| lastMsgId = msgId; | ||
| } | ||
|
|
||
| // close consumer so, this consumer's unack messages will be redelivered to new consumer | ||
| consumer1.close(); | ||
|
|
||
| Consumer<byte[]> consumer2 = consumerBuilder.subscribe(); | ||
| lastMsgId = null; | ||
| for (int i = 0; i < totalMsgs / 2; i++) { | ||
| Message<byte[]> message = consumer2.receive(5, TimeUnit.SECONDS); | ||
| MessageIdImpl msgId = (MessageIdImpl) message.getMessageId(); | ||
| if (lastMsgId != null) { | ||
| assertTrue(lastMsgId.getLedgerId() <= msgId.getLedgerId()); | ||
| } | ||
| lastMsgId = msgId; | ||
| } | ||
|
|
||
| producer.close(); | ||
| consumer2.close(); | ||
| } | ||
|
|
||
| } |
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 |
|---|---|---|
|
|
@@ -26,6 +26,9 @@ | |
| import java.util.Set; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import java.util.concurrent.locks.StampedLock; | ||
| import java.util.function.BiFunction; | ||
|
|
||
| import org.apache.pulsar.common.util.collections.LongPairSet.LongPairFunction; | ||
|
|
||
| /** | ||
| * Concurrent hash set where values are composed of pairs of longs. | ||
|
|
@@ -38,7 +41,7 @@ | |
| * <p> | ||
| * Values <strong>MUST</strong> be >= 0. | ||
| */ | ||
| public class ConcurrentLongPairSet implements LongPairSet { | ||
|
|
||
| private static final long EmptyItem = -1L; | ||
| private static final long DeletedItem = -2L; | ||
|
|
@@ -54,10 +57,6 @@ public static interface ConsumerLong { | |
| void accept(LongPair item); | ||
| } | ||
|
|
||
| public static interface LongPairConsumer { | ||
| void accept(long v1, long v2); | ||
| } | ||
|
|
@@ -190,11 +189,16 @@ public Set<LongPair> items() { | |
| * @return a new list of keys with max provided numberOfItems (makes a copy) | ||
| */ | ||
| public Set<LongPair> items(int numberOfItems) { | ||
| return items(numberOfItems, (item1, item2) -> new LongPair(item1, item2)); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> Set<T> items(int numberOfItems, LongPairFunction<T> longPairConverter) { | ||
| Set<T> items = new HashSet<>(); | ||
|
There was a problem hiding this comment. Is it necessary to return a set? typically the iteration methods are used to go through it inline without intermediary collection. There was a problem hiding this comment. yes, this method is used by PersistentDispatcherMultipleConsumers to prepare the sub-set of replay-messages and then it passes this set to |
||
| for (Section s : sections) { | ||
| s.forEach((item1, item2) -> { | ||
| if (items.size() < numberOfItems) { | ||
| items.add(longPairConverter.apply(item1, item2)); | ||
| } | ||
| }); | ||
| if (items.size() >= numberOfItems) { | ||
|
|
@@ -203,7 +207,7 @@ public Set<LongPair> items(int numberOfItems) { | |
| } | ||
| return items; | ||
| } | ||
| // A section is a portion of the hash map that is covered by a single | ||
| @SuppressWarnings("serial") | ||
| private static final class Section extends StampedLock { | ||
|
|
@@ -552,4 +556,5 @@ public String toString() { | |
| sb.append('}'); | ||
| return sb.toString(); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of having the
messagesToReplayto be sorted, wouldn't be easier to just make themessagesToReplayNowto be aSortedSet?In this case, we don't care to have
messagesToReplayto be always sorted, just when there is a redelivery is when we care.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No because
messagesToReplayNowis a very small sub-set (100 msgs) ofmessagesToReplay(> 1M msgs) and the main issue ismessagesToReplaycan have more than million random messages and we want to read messages from the same ledger. making ONLYmessagesToReplayNowsorted set will not help because there is a possibility that 100 read messages frommessagesToReplaymight be random from different ledgers and it will still perform random read across multiple ledgers.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh that's true.