Skip to content

[fix][broker] Restore the behavior to dispatch batch messages according to consumer permits #24092

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
lhotari merged 2 commits into from
Mar 19, 2025
Merged

[fix][broker] Restore the behavior to dispatch batch messages according to consumer permits #24092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ca7df6
[fix][broker] Restore the behavior to dispatch batch messages accordi…
BewareMyPower Mar 18, 2025
0a960a2
Fix the maxMessagesInThisBatch
BewareMyPower Mar 19, 2025
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: 3 additions & 3 deletions ...va/org/apache/pulsar/broker/service/persistent/PersistentDispatcherMultipleConsumers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,14 +843,14 @@ protected synchronized boolean trySendMessagesToConsumers(ReadType readType, Lis
c, c.getAvailablePermits());
}

int maxMessagesInThisBatch =
Math.max(remainingMessages, serviceConfig.getDispatcherMaxRoundRobinBatchSize());
int maxMessagesInThisBatch = Math.min(remainingMessages, availablePermits);
if (c.getMaxUnackedMessages() > 0) {
// Calculate the maximum number of additional unacked messages allowed
int maxAdditionalUnackedMessages = Math.max(c.getMaxUnackedMessages() - c.getUnackedMessages(), 0);
maxMessagesInThisBatch = Math.min(maxMessagesInThisBatch, maxAdditionalUnackedMessages);
}
int maxEntriesInThisBatch = Math.min(availablePermits,
// TODO: add tests to verify dispatcherMaxRoundRobinBatchSize is respected
int maxEntriesInThisBatch = Math.min(serviceConfig.getDispatcherMaxRoundRobinBatchSize(),
// use the average batch size per message to calculate the number of entries to
// dispatch. round up to the next integer without using floating point arithmetic.
(maxMessagesInThisBatch + avgBatchSizePerMsg - 1) / avgBatchSizePerMsg);
Expand Down
4 changes: 4 additions & 0 deletions pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,6 +1012,10 @@ public void testBatchMessageDispatchingAccordingToPermits() throws Exception {
}
FutureUtil.waitForAll(sendFutureList).get();

Awaitility.await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
assertTrue(consumer1.numMessagesInQueue() > 0);
assertTrue(consumer2.numMessagesInQueue() > 0);
});
assertEquals(consumer1.numMessagesInQueue(), batchMessages, batchMessages);
assertEquals(consumer2.numMessagesInQueue(), batchMessages, batchMessages);

Expand Down