Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[broker] Fix issue that message ordering could be broken when redeliv…
…ering messages on Key_Shared subscription (#10762) Messages with the same key can be out of order if message redelivery occurs on a Key_Shared subscription. 1. Suppose `PersistentDispatcherMultipleConsumers#messagesToRedeliver` contains message-1 and message-2. Message-1 will be delivered to consumer-a and message-2 will be delivered to consumer-b. 2. The dispatcher tried to send message-1 to consumer-a, but the consumer was too slow to send it. 3. Consumer-a is added to `stuckConsumers`. https://github.com/apache/pulsar/blob/894d92b2be3bee334e7ce32760c4d2e7978603aa/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java#L263-L266 4. The next time `readMoreEntries()` is run, `getMessagesToReplayNow()` will return an empty Set because `isDispatcherStuckOnReplays` is true. https://github.com/apache/pulsar/blob/894d92b2be3bee334e7ce32760c4d2e7978603aa/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java#L368-L374 5. The dispatcher reads newer messages instead of the messages contained in `messagesToRedeliver`. https://github.com/apache/pulsar/blob/894d92b2be3bee334e7ce32760c4d2e7978603aa/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java#L233-L267 6. A new message (message-3) is delivered to consumer-b. 7. Message-2 contained in messagesToRedeliver is delivered to consumer-b. 8. As a result, the order of message-2 and message-3 is reversed. When adding a message to be redeliver to `messagesToRedeliver`, save the hash of the key that the message has. If the dispatcher attempts to send newer messages to the consumer that have a key corresponding to any one of the saved hash values, they will be added to `messagesToRedeliver` instead of being sent. This prevents messages with the same key from being out of order. (cherry picked from commit 5aee599)
- Loading branch information
1 parent
7537376
commit 0d383ba
Showing
12 changed files
with
614 additions
and
89 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
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
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
120 changes: 120 additions & 0 deletions
120
...rc/main/java/org/apache/pulsar/broker/service/persistent/MessageRedeliveryController.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,120 @@ | ||
| /** | ||
| * 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.broker.service.persistent; | ||
|
|
||
| import com.google.common.collect.ComparisonChain; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.TreeSet; | ||
| import java.util.concurrent.atomic.AtomicBoolean; | ||
| import java.util.stream.Collectors; | ||
| import org.apache.bookkeeper.mledger.impl.PositionImpl; | ||
| import org.apache.bookkeeper.util.collections.ConcurrentLongLongPairHashMap; | ||
| import org.apache.bookkeeper.util.collections.ConcurrentLongLongPairHashMap.LongPair; | ||
| import org.apache.pulsar.common.util.collections.ConcurrentSortedLongPairSet; | ||
| import org.apache.pulsar.common.util.collections.LongPairSet; | ||
|
|
||
| public class MessageRedeliveryController { | ||
| private final LongPairSet messagesToRedeliver; | ||
| private final ConcurrentLongLongPairHashMap hashesToBeBlocked; | ||
|
|
||
| public MessageRedeliveryController(boolean allowOutOfOrderDelivery) { | ||
| this.messagesToRedeliver = new ConcurrentSortedLongPairSet(128, 2); | ||
| this.hashesToBeBlocked = allowOutOfOrderDelivery ? null : new ConcurrentLongLongPairHashMap(128, 2); | ||
| } | ||
|
|
||
| public boolean add(long ledgerId, long entryId) { | ||
| return messagesToRedeliver.add(ledgerId, entryId); | ||
| } | ||
|
|
||
| public boolean add(long ledgerId, long entryId, long stickyKeyHash) { | ||
| if (hashesToBeBlocked != null) { | ||
| hashesToBeBlocked.put(ledgerId, entryId, stickyKeyHash, 0); | ||
| } | ||
| return messagesToRedeliver.add(ledgerId, entryId); | ||
| } | ||
|
|
||
| public boolean remove(long ledgerId, long entryId) { | ||
| if (hashesToBeBlocked != null) { | ||
| hashesToBeBlocked.remove(ledgerId, entryId); | ||
| } | ||
| return messagesToRedeliver.remove(ledgerId, entryId); | ||
| } | ||
|
|
||
| public int removeAllUpTo(long markDeleteLedgerId, long markDeleteEntryId) { | ||
| if (hashesToBeBlocked != null) { | ||
| List<LongPair> keysToRemove = new ArrayList<>(); | ||
| hashesToBeBlocked.forEach((ledgerId, entryId, stickyKeyHash, none) -> { | ||
| if (ComparisonChain.start().compare(ledgerId, markDeleteLedgerId).compare(entryId, markDeleteEntryId) | ||
| .result() <= 0) { | ||
| keysToRemove.add(new LongPair(ledgerId, entryId)); | ||
| } | ||
| }); | ||
| keysToRemove.forEach(longPair -> hashesToBeBlocked.remove(longPair.first, longPair.second)); | ||
| keysToRemove.clear(); | ||
| } | ||
| return messagesToRedeliver.removeIf((ledgerId, entryId) -> { | ||
| return ComparisonChain.start().compare(ledgerId, markDeleteLedgerId).compare(entryId, markDeleteEntryId) | ||
| .result() <= 0; | ||
| }); | ||
| } | ||
|
|
||
| public boolean isEmpty() { | ||
| return messagesToRedeliver.isEmpty(); | ||
| } | ||
|
|
||
| public void clear() { | ||
| if (hashesToBeBlocked != null) { | ||
| hashesToBeBlocked.clear(); | ||
| } | ||
| messagesToRedeliver.clear(); | ||
| } | ||
|
|
||
| public String toString() { | ||
| return messagesToRedeliver.toString(); | ||
| } | ||
|
|
||
| public boolean containsStickyKeyHashes(Set<Integer> stickyKeyHashes) { | ||
| final AtomicBoolean isContained = new AtomicBoolean(false); | ||
| if (hashesToBeBlocked != null) { | ||
| hashesToBeBlocked.forEach((ledgerId, entryId, stickyKeyHash, none) -> { | ||
| if (!isContained.get() && stickyKeyHashes.contains((int) stickyKeyHash)) { | ||
| isContained.set(true); | ||
| } | ||
| }); | ||
| } | ||
| return isContained.get(); | ||
| } | ||
|
|
||
| public Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToRead) { | ||
| if (hashesToBeBlocked != null) { | ||
| // allowOutOfOrderDelivery is false | ||
| return messagesToRedeliver.items().stream() | ||
| .sorted((l1, l2) -> ComparisonChain.start().compare(l1.first, l2.first) | ||
| .compare(l1.second, l2.second).result()) | ||
| .limit(maxMessagesToRead).map(longPair -> new PositionImpl(longPair.first, longPair.second)) | ||
| .collect(Collectors.toCollection(TreeSet::new)); | ||
| } else { | ||
| // allowOutOfOrderDelivery is true | ||
| return messagesToRedeliver.items(maxMessagesToRead, | ||
| (ledgerId, entryId) -> new PositionImpl(ledgerId, entryId)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.