Skip to content

[fix][broker] Fix consumer does not abide by the max unacks limitation for Key_Shared subscription #16718

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

Merged
codelipenghui merged 1 commit into from
Jul 22, 2022
Merged

[fix][broker] Fix consumer does not abide by the max unacks limitation for Key_Shared subscription #16718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion ...ache/pulsar/broker/service/persistent/PersistentStickyKeyDispatcherMultipleConsumers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,11 @@ protected void sendMessagesToConsumers(ReadType readType, List<Entry> entries) {
Consumer consumer = current.getKey();
List<Entry> entriesWithSameKey = current.getValue();
int entriesWithSameKeyCount = entriesWithSameKey.size();
final int availablePermits = consumer == null ? 0 : Math.max(consumer.getAvailablePermits(), 0);
int availablePermits = consumer == null ? 0 : Math.max(consumer.getAvailablePermits(), 0);
if (consumer != null && consumer.getMaxUnackedMessages() > 0) {
availablePermits = Math.min(availablePermits,
consumer.getMaxUnackedMessages() - consumer.getUnackedMessages());
}
int maxMessagesForC = Math.min(entriesWithSameKeyCount, availablePermits);
int messagesForC = getRestrictedMaxEntriesForConsumer(consumer, entriesWithSameKey, maxMessagesForC,
readType, consumerStickyKeyHashesMap.get(consumer));
Expand Down
17 changes: 14 additions & 3 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/api/SimpleProducerConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@ public Object[][] ackReceiptEnabled() {
return new Object[][] { { true }, { false } };
}

@DataProvider(name = "ackReceiptEnabledAndSubscriptionTypes")
public Object[][] ackReceiptEnabledAndSubscriptionTypes() {
return new Object[][] {
{true, SubscriptionType.Shared},
{true, SubscriptionType.Key_Shared},
{false, SubscriptionType.Shared},
{false, SubscriptionType.Key_Shared},
};
}

@AfterMethod(alwaysRun = true)
@Override
protected void cleanup() throws Exception {
Expand Down Expand Up @@ -1591,16 +1601,17 @@ public void testConsumerBlockingWithUnAckedMessagesMultipleIteration(boolean ack
}
}

@Test(dataProvider = "ackReceiptEnabled")
public void testMaxUnAckMessagesLowerThanPermits(boolean ackReceiptEnabled) throws PulsarClientException {
@Test(dataProvider = "ackReceiptEnabledAndSubscriptionTypes")
public void testMaxUnAckMessagesLowerThanPermits(boolean ackReceiptEnabled, SubscriptionType subType)
throws PulsarClientException {
final int maxUnacks = 10;
pulsar.getConfiguration().setMaxUnackedMessagesPerConsumer(maxUnacks);
final String topic = "persistent://my-property/my-ns/testMaxUnAckMessagesLowerThanPermits";

@Cleanup
Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING)
.topic(topic).subscriptionName("sub")
.subscriptionType(SubscriptionType.Shared)
.subscriptionType(subType)
.isAckReceiptEnabled(ackReceiptEnabled)
.acknowledgmentGroupTime(0, TimeUnit.SECONDS)
.subscribe();
Expand Down