Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.netty.buffer.ByteBuf;
import io.netty.buffer.CompositeByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.FastThreadLocal;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -2040,36 +2041,44 @@ private static ByteBufPair serializeCommandSendWithSize(BaseCommand cmd, Checksu
int checksumReaderIndex = -1;

ByteBuf headers = PulsarByteBufAllocator.DEFAULT.buffer(headersSize, headersSize);
headers.writeInt(totalSize); // External frame

// Write cmd
headers.writeInt(cmdSize);
cmd.writeTo(headers);
try {
headers.writeInt(totalSize); // External frame

// Create checksum placeholder
if (includeChecksum) {
headers.writeShort(magicCrc32c);
checksumReaderIndex = headers.writerIndex();
headers.writerIndex(headers.writerIndex() + checksumSize); // skip 4 bytes of checksum
}
// Write cmd
headers.writeInt(cmdSize);
cmd.writeTo(headers);

// Write metadata
headers.writeInt(msgMetadataSize);
msgMetadata.writeTo(headers);
// Create checksum placeholder
if (includeChecksum) {
headers.writeShort(magicCrc32c);
checksumReaderIndex = headers.writerIndex();
headers.writerIndex(headers.writerIndex() + checksumSize); // skip 4 bytes of checksum
}

ByteBufPair command = ByteBufPair.get(headers, payload);
// Write metadata
headers.writeInt(msgMetadataSize);
msgMetadata.writeTo(headers);

// write checksum at created checksum-placeholder
if (includeChecksum) {
headers.markReaderIndex();
headers.readerIndex(checksumReaderIndex + checksumSize);
int metadataChecksum = computeChecksum(headers);
int computedChecksum = resumeChecksum(metadataChecksum, payload);
// set computed checksum
headers.setInt(checksumReaderIndex, computedChecksum);
headers.resetReaderIndex();
}

// write checksum at created checksum-placeholder
if (includeChecksum) {
headers.markReaderIndex();
headers.readerIndex(checksumReaderIndex + checksumSize);
int metadataChecksum = computeChecksum(headers);
int computedChecksum = resumeChecksum(metadataChecksum, payload);
// set computed checksum
headers.setInt(checksumReaderIndex, computedChecksum);
headers.resetReaderIndex();
// Create the pair last so it becomes the single owner of both buffers on success: if anything above
// throws (e.g. an OOM while serializing the command or metadata), the header is released here instead
// of being orphaned. The payload is deliberately not touched on failure; releasing it on a failed
// send remains a pre-existing gap on the caller side.
return ByteBufPair.get(headers, payload);
Comment thread
lhotari marked this conversation as resolved.
} catch (Throwable t) {
ReferenceCountUtil.safeRelease(headers);
throw t;
}
return command;
}

public static ByteBuf addBrokerEntryMetadata(ByteBuf headerAndPayload,
Expand Down Expand Up @@ -2398,12 +2407,17 @@ public static ByteBufPair serializeCommandMessageWithSize(BaseCommand cmd, ByteB
int headersSize = 4 + 4 + cmdSize;

ByteBuf headers = PulsarByteBufAllocator.DEFAULT.buffer(headersSize);
headers.writeInt(totalSize); // External frame
try {
headers.writeInt(totalSize); // External frame

// Write cmd
headers.writeInt(cmdSize);
cmd.writeTo(headers);
return ByteBufPair.get(headers, metadataAndPayload);
// Write cmd
headers.writeInt(cmdSize);
cmd.writeTo(headers);
return ByteBufPair.get(headers, metadataAndPayload);
} catch (Throwable t) {
ReferenceCountUtil.safeRelease(headers);
throw t;
}
}

public static MessageMetadata peekMessageMetadata(ByteBuf metadataAndPayload, String subscription,
Expand Down
Loading