-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issue that message ordering could be broken when redelivering mes…
…sages on Key_Shared subscription
- Loading branch information
Masahiro Sakamoto
committed
Jun 29, 2021
1 parent
a48b725
commit 401f4ee
Showing
12 changed files
with
569 additions
and
67 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
114 changes: 114 additions & 0 deletions
114
...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,114 @@ | ||
| /** | ||
| * 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.Set; | ||
| import java.util.TreeSet; | ||
| 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) { | ||
| for (LongPair longPair : hashesToBeBlocked.keys()) { | ||
| long ledgerId = longPair.first; | ||
| long entryId = longPair.second; | ||
| if (ComparisonChain.start().compare(ledgerId, markDeleteLedgerId).compare(entryId, markDeleteEntryId) | ||
| .result() <= 0) { | ||
| hashesToBeBlocked.remove(ledgerId, entryId); | ||
| } | ||
| } | ||
| } | ||
| 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) { | ||
| if (hashesToBeBlocked != null) { | ||
| for (LongPair longPair : hashesToBeBlocked.values()) { | ||
| int stickyKeyHash = (int) longPair.first; | ||
| if (stickyKeyHashes.contains(stickyKeyHash)) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public Set<PositionImpl> getMessagesToReplayNow(int maxMessagesToRead) { | ||
| if (hashesToBeBlocked != null) { | ||
| 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 { | ||
| return messagesToRedeliver.items(maxMessagesToRead, | ||
| (ledgerId, entryId) -> new PositionImpl(ledgerId, entryId)); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.