franz1981 commented on a change in pull request #3711:
URL: https://github.com/apache/activemq-artemis/pull/3711#discussion_r701308880
##########
File path:
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
##########
@@ -661,43 +649,67 @@ void deliver() {
}
}
+ private boolean deliverInitialPacket(final LargeBodyReader context,
+ final DeliveryAnnotations
deliveryAnnotationsToEncode,
+ final ByteBuf frameBuffer) throws
Exception {
+ assert position == 0 && context.position() == 0;
+ if (!connection.flowControl(this::resume)) {
+ return false;
+ }
+ frameBuffer.clear();
+ try {
+ replaceInitialHeader(deliveryAnnotationsToEncode, context, new
NettyWritable(frameBuffer));
+ } catch (IndexOutOfBoundsException indexOutOfBoundsException) {
+ assert position == 0 : "this shouldn't happen unless
replaceInitialHeader is updating position before modifying frameBuffer";
+ if (log.isDebugEnabled()) {
+ log.debug("Delivery of message failed with an
overFlowException, retrying again with expandable buffer");
+ }
+ // on the very first packet, if the initial header was replaced
with a much bigger header (re-encoding)
+ // we could recover the situation with a retry using an expandable
buffer.
+ // this is tested on
org.apache.activemq.artemis.tests.integration.amqp.AmqpMessageDivertsTest
+ sendAndFlushInitialPacket(deliveryAnnotationsToEncode, context);
+ return true;
+ }
+ final int writableBytes = frameBuffer.writableBytes();
+ if (writableBytes == 0) {
+ sender.send(new NettyReadable(frameBuffer));
+ connection.instantFlush();
+ return true;
+ }
+ final int writtenBytes = frameBuffer.writerIndex();
+ final int readSize =
context.readInto(frameBuffer.internalNioBuffer(writtenBytes, writableBytes));
+ frameBuffer.writerIndex(writtenBytes + readSize);
+ sender.send(new NettyReadable(frameBuffer));
+ position += readSize;
+ connection.instantFlush();
+ return true;
Review comment:
The fail fast path can be saved, but that means leaving 0 bytes
available to the nii buffer and actually not reading anything on the file
(that's ok).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
