Skip to content

[improve][broker] Reuse dispatched entry list for release #291

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

Open
lhotari wants to merge 1 commit into
base: lh-perfopt-dedup-producer-state
Choose a base branch
from
Open

[improve][broker] Reuse dispatched entry list for release #291

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
25 changes: 18 additions & 7 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/PulsarCommandSenderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,11 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName,
final ChannelHandlerContext ctx = cnx.ctx();
final ChannelPromise writePromise = ctx.newPromise();
ctx.channel().eventLoop().execute(() -> {
// this list is always accessed in the same thread (the eventLoop here)
// and in the completion of the writePromise
// it is safe to use a simple ArrayList
List<Entry> entriesToRelease = new ArrayList<>(entries.size());
// Legacy clients can reject individual batch entries, so retain a separate release list for them.
// Modern clients accept every non-null entry and the owned dispatch list is already the release list.
boolean batchMessageCompatibleVersion = cnx.isBatchMessageCompatibleVersion();
List<Entry> compatibleEntriesToRelease = batchMessageCompatibleVersion
? null : new ArrayList<>(entries.size());
for (int i = 0; i < entries.size(); i++) {
Entry entry = entries.get(i);
if (entry == null) {
Expand All @@ -252,7 +253,7 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName,

int batchSize = batchSizes.getBatchSize(i);

if (batchSize > 1 && !cnx.isBatchMessageCompatibleVersion()) {
if (batchSize > 1 && !batchMessageCompatibleVersion) {
log.warn()
.attr("topic", topicName)
.attr("subscription", subscription)
Expand Down Expand Up @@ -299,7 +300,9 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName,
redeliveryCount, metadataAndPayload,
batchIndexesAcks == null ? null : batchIndexesAcks.getAckSet(i), topicName, epoch),
ctx.voidPromise());
entriesToRelease.add(entry);
if (compatibleEntriesToRelease != null) {
compatibleEntriesToRelease.add(entry);
}
}

// Use an empty write here so that we can just tie the flush with the write promise for last entry
Expand All @@ -311,7 +314,7 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName,
// consumer. It counts the memory as being released when the entry is deallocated
// that is that it reaches refcnt=0.
// so we need to call release only when we are sure that Netty released the internal ByteBuf
entriesToRelease.forEach(Entry::release);
releaseEntries(compatibleEntriesToRelease != null ? compatibleEntriesToRelease : entries);
});
batchSizes.recyle();
if (batchIndexesAcks != null) {
Expand All @@ -322,6 +325,14 @@ public ChannelPromise sendMessagesToConsumer(long consumerId, String topicName,
return writePromise;
}

private static void releaseEntries(List<? extends Entry> entries) {
for (Entry entry : entries) {
if (entry != null) {
entry.release();
}
}
}

@Override
public void sendTcClientConnectResponse(long requestId, ServerError error, String message) {
BaseCommand command = Commands.newTcClientConnectResponse(requestId, error, message);
Expand Down