Skip to content

[fix][broker] Fix stuck chunks in SharedConsumerAssignor permit tracking #25620

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 1 commit into from
Apr 30, 2026
+5 −5
Merged

[fix][broker] Fix stuck chunks in SharedConsumerAssignor permit tracking #25620

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
10 changes: 5 additions & 5 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/SharedConsumerAssignor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public Map<Consumer, List<EntryAndMetadata>> assign(final List<EntryAndMetadata>
if (metadata == null || !metadata.hasUuid() || !metadata.hasChunkId() || !metadata.hasNumChunksFromMsg()) {
consumerToEntries.computeIfAbsent(consumer, __ -> new ArrayList<>()).add(entryAndMetadata);
} else {
final Consumer consumerForUuid = getConsumerForUuid(metadata, consumer, availablePermits);
final Consumer consumerForUuid = getConsumerForUuid(metadata, consumer);
if (consumerForUuid == null) {
unassignedMessageProcessor.accept(entryAndMetadata);
continue;
Expand Down Expand Up @@ -123,9 +123,7 @@ private Consumer getConsumer(final int numConsumers) {
return null;
}

private Consumer getConsumerForUuid(final MessageMetadata metadata,
final Consumer defaultConsumer,
final int currentAvailablePermits) {
private Consumer getConsumerForUuid(final MessageMetadata metadata, final Consumer defaultConsumer) {
final String uuid = metadata.getUuid();
Consumer consumer = uuidToConsumer.get(uuid);
if (consumer == null) {
Expand All @@ -144,7 +142,9 @@ private Consumer getConsumerForUuid(final MessageMetadata metadata,
// The last chunk is received, we should remove the cache
uuidToConsumer.remove(uuid);
}
consumerToPermits.put(consumer, currentAvailablePermits - 1);
// Decrement target consumer's permits, not the loop's local availablePermits — on a cache
// redirect those track different consumers.
consumerToPermits.put(consumer, permits - 1);
return consumer;
}
}
Loading