2012-07-03 10:37:05 +02:00
|
|
|
/*
|
|
|
|
* Copyright 2012 The Netty Project
|
|
|
|
*
|
|
|
|
* The Netty Project licenses this file to you under the Apache License,
|
|
|
|
* version 2.0 (the "License"); you may not use this file except in compliance
|
|
|
|
* with the License. You may obtain a copy of the License at:
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
|
|
* License for the specific language governing permissions and limitations
|
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
package io.netty.handler.codec.http;
|
|
|
|
|
|
|
|
import io.netty.buffer.ByteBuf;
|
|
|
|
import io.netty.buffer.CompositeByteBuf;
|
2012-07-19 13:23:55 +02:00
|
|
|
import io.netty.buffer.Unpooled;
|
2012-07-03 10:37:05 +02:00
|
|
|
import io.netty.channel.ChannelHandlerContext;
|
Revamp the core API to reduce memory footprint and consumption
The API changes made so far turned out to increase the memory footprint
and consumption while our intention was actually decreasing them.
Memory consumption issue:
When there are many connections which does not exchange data frequently,
the old Netty 4 API spent a lot more memory than 3 because it always
allocates per-handler buffer for each connection unless otherwise
explicitly stated by a user. In a usual real world load, a client
doesn't always send requests without pausing, so the idea of having a
buffer whose life cycle if bound to the life cycle of a connection
didn't work as expected.
Memory footprint issue:
The old Netty 4 API decreased overall memory footprint by a great deal
in many cases. It was mainly because the old Netty 4 API did not
allocate a new buffer and event object for each read. Instead, it
created a new buffer for each handler in a pipeline. This works pretty
well as long as the number of handlers in a pipeline is only a few.
However, for a highly modular application with many handlers which
handles connections which lasts for relatively short period, it actually
makes the memory footprint issue much worse.
Changes:
All in all, this is about retaining all the good changes we made in 4 so
far such as better thread model and going back to the way how we dealt
with message events in 3.
To fix the memory consumption/footprint issue mentioned above, we made a
hard decision to break the backward compatibility again with the
following changes:
- Remove MessageBuf
- Merge Buf into ByteBuf
- Merge ChannelInboundByte/MessageHandler and ChannelStateHandler into ChannelInboundHandler
- Similar changes were made to the adapter classes
- Merge ChannelOutboundByte/MessageHandler and ChannelOperationHandler into ChannelOutboundHandler
- Similar changes were made to the adapter classes
- Introduce MessageList which is similar to `MessageEvent` in Netty 3
- Replace inboundBufferUpdated(ctx) with messageReceived(ctx, MessageList)
- Replace flush(ctx, promise) with write(ctx, MessageList, promise)
- Remove ByteToByteEncoder/Decoder/Codec
- Replaced by MessageToByteEncoder<ByteBuf>, ByteToMessageDecoder<ByteBuf>, and ByteMessageCodec<ByteBuf>
- Merge EmbeddedByteChannel and EmbeddedMessageChannel into EmbeddedChannel
- Add SimpleChannelInboundHandler which is sometimes more useful than
ChannelInboundHandlerAdapter
- Bring back Channel.isWritable() from Netty 3
- Add ChannelInboundHandler.channelWritabilityChanges() event
- Add RecvByteBufAllocator configuration property
- Similar to ReceiveBufferSizePredictor in Netty 3
- Some existing configuration properties such as
DatagramChannelConfig.receivePacketSize is gone now.
- Remove suspend/resumeIntermediaryDeallocation() in ByteBuf
This change would have been impossible without @normanmaurer's help. He
fixed, ported, and improved many parts of the changes.
2013-05-28 13:40:19 +02:00
|
|
|
import io.netty.channel.embedded.EmbeddedChannel;
|
2014-07-02 12:04:11 +02:00
|
|
|
import io.netty.handler.codec.DecoderResultProvider;
|
2014-02-20 20:46:41 +01:00
|
|
|
import io.netty.handler.codec.TooLongFrameException;
|
2014-02-20 20:35:23 +01:00
|
|
|
import io.netty.handler.codec.http.HttpHeaders.Names;
|
2012-07-03 10:37:05 +02:00
|
|
|
import io.netty.util.CharsetUtil;
|
2013-01-16 05:22:50 +01:00
|
|
|
import org.easymock.EasyMock;
|
|
|
|
import org.junit.Test;
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2014-02-07 17:59:51 +01:00
|
|
|
import java.nio.channels.ClosedChannelException;
|
2012-07-19 13:23:55 +02:00
|
|
|
import java.util.List;
|
|
|
|
|
2013-12-16 14:22:47 +01:00
|
|
|
import static io.netty.util.ReferenceCountUtil.*;
|
2014-02-20 00:31:53 +01:00
|
|
|
import static org.hamcrest.CoreMatchers.*;
|
2013-01-16 05:22:50 +01:00
|
|
|
import static org.junit.Assert.*;
|
2012-07-03 10:37:05 +02:00
|
|
|
|
2013-04-30 20:41:50 +02:00
|
|
|
public class HttpObjectAggregatorTest {
|
2012-07-03 10:37:05 +02:00
|
|
|
|
|
|
|
@Test
|
|
|
|
public void testAggregate() {
|
2013-01-14 16:52:30 +01:00
|
|
|
HttpObjectAggregator aggr = new HttpObjectAggregator(1024 * 1024);
|
Revamp the core API to reduce memory footprint and consumption
The API changes made so far turned out to increase the memory footprint
and consumption while our intention was actually decreasing them.
Memory consumption issue:
When there are many connections which does not exchange data frequently,
the old Netty 4 API spent a lot more memory than 3 because it always
allocates per-handler buffer for each connection unless otherwise
explicitly stated by a user. In a usual real world load, a client
doesn't always send requests without pausing, so the idea of having a
buffer whose life cycle if bound to the life cycle of a connection
didn't work as expected.
Memory footprint issue:
The old Netty 4 API decreased overall memory footprint by a great deal
in many cases. It was mainly because the old Netty 4 API did not
allocate a new buffer and event object for each read. Instead, it
created a new buffer for each handler in a pipeline. This works pretty
well as long as the number of handlers in a pipeline is only a few.
However, for a highly modular application with many handlers which
handles connections which lasts for relatively short period, it actually
makes the memory footprint issue much worse.
Changes:
All in all, this is about retaining all the good changes we made in 4 so
far such as better thread model and going back to the way how we dealt
with message events in 3.
To fix the memory consumption/footprint issue mentioned above, we made a
hard decision to break the backward compatibility again with the
following changes:
- Remove MessageBuf
- Merge Buf into ByteBuf
- Merge ChannelInboundByte/MessageHandler and ChannelStateHandler into ChannelInboundHandler
- Similar changes were made to the adapter classes
- Merge ChannelOutboundByte/MessageHandler and ChannelOperationHandler into ChannelOutboundHandler
- Similar changes were made to the adapter classes
- Introduce MessageList which is similar to `MessageEvent` in Netty 3
- Replace inboundBufferUpdated(ctx) with messageReceived(ctx, MessageList)
- Replace flush(ctx, promise) with write(ctx, MessageList, promise)
- Remove ByteToByteEncoder/Decoder/Codec
- Replaced by MessageToByteEncoder<ByteBuf>, ByteToMessageDecoder<ByteBuf>, and ByteMessageCodec<ByteBuf>
- Merge EmbeddedByteChannel and EmbeddedMessageChannel into EmbeddedChannel
- Add SimpleChannelInboundHandler which is sometimes more useful than
ChannelInboundHandlerAdapter
- Bring back Channel.isWritable() from Netty 3
- Add ChannelInboundHandler.channelWritabilityChanges() event
- Add RecvByteBufAllocator configuration property
- Similar to ReceiveBufferSizePredictor in Netty 3
- Some existing configuration properties such as
DatagramChannelConfig.receivePacketSize is gone now.
- Remove suspend/resumeIntermediaryDeallocation() in ByteBuf
This change would have been impossible without @normanmaurer's help. He
fixed, ported, and improved many parts of the changes.
2013-05-28 13:40:19 +02:00
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(aggr);
|
2012-07-03 10:37:05 +02:00
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost");
|
2012-07-03 10:37:05 +02:00
|
|
|
HttpHeaders.setHeader(message, "X-Test", true);
|
2013-01-14 16:52:30 +01:00
|
|
|
HttpContent chunk1 = new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk2 = new DefaultHttpContent(Unpooled.copiedBuffer("test2", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk3 = new DefaultLastHttpContent(Unpooled.EMPTY_BUFFER);
|
2012-07-03 10:37:05 +02:00
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2013-07-09 16:09:28 +02:00
|
|
|
// this should trigger a channelRead event so return true
|
2012-07-03 10:37:05 +02:00
|
|
|
assertTrue(embedder.writeInbound(chunk3));
|
|
|
|
assertTrue(embedder.finish());
|
2013-12-16 14:22:47 +01:00
|
|
|
FullHttpRequest aggratedMessage = embedder.readInbound();
|
2012-07-03 10:37:05 +02:00
|
|
|
assertNotNull(aggratedMessage);
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2013-05-01 10:04:43 +02:00
|
|
|
assertEquals(chunk1.content().readableBytes() + chunk2.content().readableBytes(),
|
2013-03-27 08:31:43 +01:00
|
|
|
HttpHeaders.getContentLength(aggratedMessage));
|
2013-01-16 05:22:50 +01:00
|
|
|
assertEquals(aggratedMessage.headers().get("X-Test"), Boolean.TRUE.toString());
|
2012-07-03 10:37:05 +02:00
|
|
|
checkContentBuffer(aggratedMessage);
|
|
|
|
assertNull(embedder.readInbound());
|
|
|
|
}
|
|
|
|
|
2013-04-30 20:41:20 +02:00
|
|
|
private static void checkContentBuffer(FullHttpRequest aggregatedMessage) {
|
2013-05-01 10:04:43 +02:00
|
|
|
CompositeByteBuf buffer = (CompositeByteBuf) aggregatedMessage.content();
|
2012-07-03 10:37:05 +02:00
|
|
|
assertEquals(2, buffer.numComponents());
|
|
|
|
List<ByteBuf> buffers = buffer.decompose(0, buffer.capacity());
|
|
|
|
assertEquals(2, buffers.size());
|
|
|
|
for (ByteBuf buf: buffers) {
|
|
|
|
// This should be false as we decompose the buffer before to not have deep hierarchy
|
|
|
|
assertFalse(buf instanceof CompositeByteBuf);
|
|
|
|
}
|
2013-10-01 09:57:20 +02:00
|
|
|
aggregatedMessage.release();
|
2012-07-03 10:37:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
public void testAggregateWithTrailer() {
|
2013-01-14 16:52:30 +01:00
|
|
|
HttpObjectAggregator aggr = new HttpObjectAggregator(1024 * 1024);
|
Revamp the core API to reduce memory footprint and consumption
The API changes made so far turned out to increase the memory footprint
and consumption while our intention was actually decreasing them.
Memory consumption issue:
When there are many connections which does not exchange data frequently,
the old Netty 4 API spent a lot more memory than 3 because it always
allocates per-handler buffer for each connection unless otherwise
explicitly stated by a user. In a usual real world load, a client
doesn't always send requests without pausing, so the idea of having a
buffer whose life cycle if bound to the life cycle of a connection
didn't work as expected.
Memory footprint issue:
The old Netty 4 API decreased overall memory footprint by a great deal
in many cases. It was mainly because the old Netty 4 API did not
allocate a new buffer and event object for each read. Instead, it
created a new buffer for each handler in a pipeline. This works pretty
well as long as the number of handlers in a pipeline is only a few.
However, for a highly modular application with many handlers which
handles connections which lasts for relatively short period, it actually
makes the memory footprint issue much worse.
Changes:
All in all, this is about retaining all the good changes we made in 4 so
far such as better thread model and going back to the way how we dealt
with message events in 3.
To fix the memory consumption/footprint issue mentioned above, we made a
hard decision to break the backward compatibility again with the
following changes:
- Remove MessageBuf
- Merge Buf into ByteBuf
- Merge ChannelInboundByte/MessageHandler and ChannelStateHandler into ChannelInboundHandler
- Similar changes were made to the adapter classes
- Merge ChannelOutboundByte/MessageHandler and ChannelOperationHandler into ChannelOutboundHandler
- Similar changes were made to the adapter classes
- Introduce MessageList which is similar to `MessageEvent` in Netty 3
- Replace inboundBufferUpdated(ctx) with messageReceived(ctx, MessageList)
- Replace flush(ctx, promise) with write(ctx, MessageList, promise)
- Remove ByteToByteEncoder/Decoder/Codec
- Replaced by MessageToByteEncoder<ByteBuf>, ByteToMessageDecoder<ByteBuf>, and ByteMessageCodec<ByteBuf>
- Merge EmbeddedByteChannel and EmbeddedMessageChannel into EmbeddedChannel
- Add SimpleChannelInboundHandler which is sometimes more useful than
ChannelInboundHandlerAdapter
- Bring back Channel.isWritable() from Netty 3
- Add ChannelInboundHandler.channelWritabilityChanges() event
- Add RecvByteBufAllocator configuration property
- Similar to ReceiveBufferSizePredictor in Netty 3
- Some existing configuration properties such as
DatagramChannelConfig.receivePacketSize is gone now.
- Remove suspend/resumeIntermediaryDeallocation() in ByteBuf
This change would have been impossible without @normanmaurer's help. He
fixed, ported, and improved many parts of the changes.
2013-05-28 13:40:19 +02:00
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(aggr);
|
2014-02-20 20:35:23 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "http://localhost");
|
2012-07-03 10:37:05 +02:00
|
|
|
HttpHeaders.setHeader(message, "X-Test", true);
|
2013-01-14 16:52:30 +01:00
|
|
|
HttpHeaders.setTransferEncodingChunked(message);
|
|
|
|
HttpContent chunk1 = new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk2 = new DefaultHttpContent(Unpooled.copiedBuffer("test2", CharsetUtil.US_ASCII));
|
|
|
|
LastHttpContent trailer = new DefaultLastHttpContent();
|
2013-01-16 05:22:50 +01:00
|
|
|
trailer.trailingHeaders().set("X-Trailer", true);
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2012-07-03 10:37:05 +02:00
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2013-07-09 16:09:28 +02:00
|
|
|
// this should trigger a channelRead event so return true
|
2012-07-03 10:37:05 +02:00
|
|
|
assertTrue(embedder.writeInbound(trailer));
|
|
|
|
assertTrue(embedder.finish());
|
2013-12-16 14:22:47 +01:00
|
|
|
FullHttpRequest aggratedMessage = embedder.readInbound();
|
2012-07-03 10:37:05 +02:00
|
|
|
assertNotNull(aggratedMessage);
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2013-05-01 10:04:43 +02:00
|
|
|
assertEquals(chunk1.content().readableBytes() + chunk2.content().readableBytes(),
|
2013-03-27 08:31:43 +01:00
|
|
|
HttpHeaders.getContentLength(aggratedMessage));
|
2013-01-16 05:22:50 +01:00
|
|
|
assertEquals(aggratedMessage.headers().get("X-Test"), Boolean.TRUE.toString());
|
2014-07-04 11:48:23 +02:00
|
|
|
assertEquals(aggratedMessage.trailingHeaders().get("X-Trailer"), Boolean.TRUE.toString());
|
2012-07-03 10:37:05 +02:00
|
|
|
checkContentBuffer(aggratedMessage);
|
|
|
|
assertNull(embedder.readInbound());
|
|
|
|
}
|
|
|
|
|
2013-05-09 19:44:39 +02:00
|
|
|
@Test
|
2014-02-20 20:35:23 +01:00
|
|
|
public void testOversizedRequest() {
|
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpObjectAggregator(4));
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
2014-02-20 20:46:41 +01:00
|
|
|
HttpContent chunk1 = new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk2 = new DefaultHttpContent(Unpooled.copiedBuffer("test2", CharsetUtil.US_ASCII));
|
2014-02-07 17:59:51 +01:00
|
|
|
HttpContent chunk3 = LastHttpContent.EMPTY_LAST_CONTENT;
|
2013-05-09 19:44:39 +02:00
|
|
|
|
2012-07-03 10:37:05 +02:00
|
|
|
assertFalse(embedder.writeInbound(message));
|
2014-02-20 20:46:41 +01:00
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
2014-02-07 17:59:51 +01:00
|
|
|
|
|
|
|
FullHttpResponse response = embedder.readOutbound();
|
2014-06-24 10:39:46 +02:00
|
|
|
assertEquals(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, response.status());
|
2014-02-20 20:35:23 +01:00
|
|
|
assertEquals("0", response.headers().get(Names.CONTENT_LENGTH));
|
2014-02-07 17:59:51 +01:00
|
|
|
assertFalse(embedder.isOpen());
|
|
|
|
|
2013-05-09 19:44:39 +02:00
|
|
|
try {
|
2014-02-20 20:46:41 +01:00
|
|
|
assertFalse(embedder.writeInbound(chunk3));
|
2013-05-09 19:44:39 +02:00
|
|
|
fail();
|
2014-02-07 17:59:51 +01:00
|
|
|
} catch (Exception e) {
|
|
|
|
assertTrue(e instanceof ClosedChannelException);
|
2013-05-09 19:44:39 +02:00
|
|
|
}
|
2014-02-07 17:59:51 +01:00
|
|
|
|
|
|
|
assertFalse(embedder.finish());
|
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2014-02-20 20:35:23 +01:00
|
|
|
public void testOversizedRequestWithoutKeepAlive() {
|
2014-02-07 17:59:51 +01:00
|
|
|
// send a HTTP/1.0 request with no keep-alive header
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_0, HttpMethod.PUT, "http://localhost");
|
2014-02-07 17:59:51 +01:00
|
|
|
HttpHeaders.setContentLength(message, 5);
|
2014-02-20 20:46:41 +01:00
|
|
|
checkOversizedRequest(message);
|
2014-02-07 17:59:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2014-02-20 20:35:23 +01:00
|
|
|
public void testOversizedRequestWithContentLength() {
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
2014-02-07 17:59:51 +01:00
|
|
|
HttpHeaders.setContentLength(message, 5);
|
2014-02-20 20:46:41 +01:00
|
|
|
checkOversizedRequest(message);
|
2014-02-07 17:59:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
2014-02-20 22:41:54 +01:00
|
|
|
public void testOversizedRequestWith100Continue() {
|
2014-02-20 20:35:23 +01:00
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpObjectAggregator(8));
|
2014-02-07 17:59:51 +01:00
|
|
|
|
|
|
|
// send an oversized request with 100 continue
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
2014-02-07 17:59:51 +01:00
|
|
|
HttpHeaders.set100ContinueExpected(message);
|
|
|
|
HttpHeaders.setContentLength(message, 16);
|
|
|
|
|
|
|
|
HttpContent chunk1 = releaseLater(new DefaultHttpContent(Unpooled.copiedBuffer("some", CharsetUtil.US_ASCII)));
|
|
|
|
HttpContent chunk2 = releaseLater(new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII)));
|
|
|
|
HttpContent chunk3 = LastHttpContent.EMPTY_LAST_CONTENT;
|
2013-05-09 19:44:39 +02:00
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
// Send a request with 100-continue + large Content-Length header value.
|
2013-05-09 19:44:39 +02:00
|
|
|
assertFalse(embedder.writeInbound(message));
|
2014-02-07 17:59:51 +01:00
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
// The agregator should respond with '413 Request Entity Too Large.'
|
|
|
|
FullHttpResponse response = embedder.readOutbound();
|
2014-06-24 10:39:46 +02:00
|
|
|
assertEquals(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, response.status());
|
2014-02-20 20:35:23 +01:00
|
|
|
assertEquals("0", response.headers().get(Names.CONTENT_LENGTH));
|
|
|
|
|
|
|
|
// An ill-behaving client could continue to send data without a respect, and such data should be discarded.
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
|
|
|
|
// The aggregator should not close the connection because keep-alive is on.
|
2014-02-07 17:59:51 +01:00
|
|
|
assertTrue(embedder.isOpen());
|
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
// Now send a valid request.
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message2 = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
2014-02-07 17:59:51 +01:00
|
|
|
|
|
|
|
assertFalse(embedder.writeInbound(message2));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
|
|
|
assertTrue(embedder.writeInbound(chunk3));
|
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
FullHttpRequest fullMsg = embedder.readInbound();
|
|
|
|
assertNotNull(fullMsg);
|
2014-02-07 17:59:51 +01:00
|
|
|
|
2014-02-20 20:35:23 +01:00
|
|
|
assertEquals(
|
|
|
|
chunk2.content().readableBytes() + chunk3.content().readableBytes(),
|
|
|
|
HttpHeaders.getContentLength(fullMsg));
|
|
|
|
|
|
|
|
assertEquals(HttpHeaders.getContentLength(fullMsg), fullMsg.content().readableBytes());
|
2014-02-07 17:59:51 +01:00
|
|
|
|
2014-02-20 22:49:35 +01:00
|
|
|
fullMsg.release();
|
2014-02-07 17:59:51 +01:00
|
|
|
assertFalse(embedder.finish());
|
|
|
|
}
|
|
|
|
|
2014-02-20 22:41:54 +01:00
|
|
|
@Test
|
|
|
|
public void testOversizedRequestWith100ContinueAndDecoder() {
|
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpRequestDecoder(), new HttpObjectAggregator(4));
|
|
|
|
embedder.writeInbound(Unpooled.copiedBuffer(
|
|
|
|
"PUT /upload HTTP/1.1\r\n" +
|
|
|
|
"Expect: 100-continue\r\n" +
|
|
|
|
"Content-Length: 100\r\n\r\n", CharsetUtil.US_ASCII));
|
|
|
|
|
|
|
|
assertNull(embedder.readInbound());
|
|
|
|
|
|
|
|
FullHttpResponse response = embedder.readOutbound();
|
2014-06-24 10:39:46 +02:00
|
|
|
assertEquals(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, response.status());
|
2014-02-20 22:41:54 +01:00
|
|
|
assertEquals("0", response.headers().get(Names.CONTENT_LENGTH));
|
|
|
|
|
|
|
|
// Keep-alive is on by default in HTTP/1.1, so the connection should be still alive.
|
|
|
|
assertTrue(embedder.isOpen());
|
|
|
|
|
|
|
|
// The decoder should be reset by the aggregator at this point and be able to decode the next request.
|
|
|
|
embedder.writeInbound(Unpooled.copiedBuffer("GET /max-upload-size HTTP/1.1\r\n\r\n", CharsetUtil.US_ASCII));
|
|
|
|
|
|
|
|
FullHttpRequest request = embedder.readInbound();
|
2014-06-24 10:39:46 +02:00
|
|
|
assertThat(request.method(), is(HttpMethod.GET));
|
|
|
|
assertThat(request.uri(), is("/max-upload-size"));
|
2014-02-20 22:41:54 +01:00
|
|
|
assertThat(request.content().readableBytes(), is(0));
|
|
|
|
request.release();
|
|
|
|
|
|
|
|
assertFalse(embedder.finish());
|
|
|
|
}
|
|
|
|
|
2014-10-07 15:56:15 +02:00
|
|
|
@Test
|
|
|
|
public void testRequestAfterOversized100ContinueAndDecoder() {
|
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpRequestDecoder(), new HttpObjectAggregator(15));
|
|
|
|
|
|
|
|
// Write first request with Expect: 100-continue
|
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
|
|
|
HttpHeaders.set100ContinueExpected(message);
|
|
|
|
HttpHeaders.setContentLength(message, 16);
|
|
|
|
|
|
|
|
HttpContent chunk1 = releaseLater(new DefaultHttpContent(Unpooled.copiedBuffer("some", CharsetUtil.US_ASCII)));
|
|
|
|
HttpContent chunk2 = releaseLater(new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII)));
|
|
|
|
HttpContent chunk3 = LastHttpContent.EMPTY_LAST_CONTENT;
|
|
|
|
|
|
|
|
// Send a request with 100-continue + large Content-Length header value.
|
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
|
|
|
|
// The agregator should respond with '413 Request Entity Too Large.'
|
|
|
|
FullHttpResponse response = embedder.readOutbound();
|
|
|
|
assertEquals(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, response.status());
|
|
|
|
assertEquals("0", response.headers().get(Names.CONTENT_LENGTH));
|
|
|
|
|
|
|
|
// An ill-behaving client could continue to send data without a respect, and such data should be discarded.
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
|
|
|
|
// The aggregator should not close the connection because keep-alive is on.
|
|
|
|
assertTrue(embedder.isOpen());
|
|
|
|
|
|
|
|
// Now send a valid request.
|
|
|
|
HttpRequest message2 = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
|
|
|
|
|
|
|
assertFalse(embedder.writeInbound(message2));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
|
|
|
assertTrue(embedder.writeInbound(chunk3));
|
|
|
|
|
|
|
|
FullHttpRequest fullMsg = embedder.readInbound();
|
|
|
|
assertNotNull(fullMsg);
|
|
|
|
|
|
|
|
assertEquals(
|
|
|
|
chunk2.content().readableBytes() + chunk3.content().readableBytes(),
|
|
|
|
HttpHeaders.getContentLength(fullMsg));
|
|
|
|
|
|
|
|
assertEquals(HttpHeaders.getContentLength(fullMsg), fullMsg.content().readableBytes());
|
|
|
|
|
|
|
|
fullMsg.release();
|
|
|
|
assertFalse(embedder.finish());
|
|
|
|
}
|
|
|
|
|
2014-02-20 20:46:41 +01:00
|
|
|
private static void checkOversizedRequest(HttpRequest message) {
|
2014-02-20 20:35:23 +01:00
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpObjectAggregator(4));
|
2014-02-07 17:59:51 +01:00
|
|
|
|
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
HttpResponse response = embedder.readOutbound();
|
2014-06-24 10:39:46 +02:00
|
|
|
assertEquals(HttpResponseStatus.REQUEST_ENTITY_TOO_LARGE, response.status());
|
2014-02-20 20:35:23 +01:00
|
|
|
assertEquals("0", response.headers().get(Names.CONTENT_LENGTH));
|
2014-10-07 15:56:15 +02:00
|
|
|
|
|
|
|
if (serverShouldCloseConnection(message)) {
|
|
|
|
assertFalse(embedder.isOpen());
|
|
|
|
assertFalse(embedder.finish());
|
|
|
|
} else {
|
|
|
|
assertTrue(embedder.isOpen());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private static boolean serverShouldCloseConnection(HttpRequest message) {
|
|
|
|
// The connection should only be kept open if Expect: 100-continue is set,
|
|
|
|
// or if keep-alive is on.
|
|
|
|
if (HttpHeaders.is100ContinueExpected(message)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (HttpHeaders.isKeepAlive(message)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
2012-07-03 10:37:05 +02:00
|
|
|
}
|
|
|
|
|
2014-02-20 20:46:41 +01:00
|
|
|
@Test
|
|
|
|
public void testOversizedResponse() {
|
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(new HttpObjectAggregator(4));
|
|
|
|
HttpResponse message = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.OK);
|
|
|
|
HttpContent chunk1 = new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk2 = new DefaultHttpContent(Unpooled.copiedBuffer("test2", CharsetUtil.US_ASCII));
|
|
|
|
|
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
|
|
|
|
try {
|
|
|
|
embedder.writeInbound(chunk2);
|
|
|
|
fail();
|
|
|
|
} catch (TooLongFrameException expected) {
|
|
|
|
// Expected
|
|
|
|
}
|
|
|
|
|
|
|
|
assertFalse(embedder.isOpen());
|
|
|
|
assertFalse(embedder.finish());
|
|
|
|
}
|
|
|
|
|
2012-07-03 10:37:05 +02:00
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
|
|
public void testInvalidConstructorUsage() {
|
2013-01-14 16:52:30 +01:00
|
|
|
new HttpObjectAggregator(0);
|
2012-07-03 10:37:05 +02:00
|
|
|
}
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2012-07-03 10:37:05 +02:00
|
|
|
@Test(expected = IllegalArgumentException.class)
|
|
|
|
public void testInvalidMaxCumulationBufferComponents() {
|
2013-03-27 08:31:43 +01:00
|
|
|
HttpObjectAggregator aggr = new HttpObjectAggregator(Integer.MAX_VALUE);
|
2012-07-03 10:37:05 +02:00
|
|
|
aggr.setMaxCumulationBufferComponents(1);
|
|
|
|
}
|
2012-07-19 13:23:55 +02:00
|
|
|
|
2012-07-03 10:37:05 +02:00
|
|
|
@Test(expected = IllegalStateException.class)
|
|
|
|
public void testSetMaxCumulationBufferComponentsAfterInit() throws Exception {
|
2013-01-14 16:52:30 +01:00
|
|
|
HttpObjectAggregator aggr = new HttpObjectAggregator(Integer.MAX_VALUE);
|
2012-07-03 10:37:05 +02:00
|
|
|
ChannelHandlerContext ctx = EasyMock.createMock(ChannelHandlerContext.class);
|
|
|
|
EasyMock.replay(ctx);
|
2013-04-05 15:46:18 +02:00
|
|
|
aggr.handlerAdded(ctx);
|
2012-07-03 10:37:05 +02:00
|
|
|
aggr.setMaxCumulationBufferComponents(10);
|
|
|
|
}
|
2013-04-30 20:41:20 +02:00
|
|
|
|
|
|
|
@Test
|
|
|
|
public void testAggregateTransferEncodingChunked() {
|
|
|
|
HttpObjectAggregator aggr = new HttpObjectAggregator(1024 * 1024);
|
Revamp the core API to reduce memory footprint and consumption
The API changes made so far turned out to increase the memory footprint
and consumption while our intention was actually decreasing them.
Memory consumption issue:
When there are many connections which does not exchange data frequently,
the old Netty 4 API spent a lot more memory than 3 because it always
allocates per-handler buffer for each connection unless otherwise
explicitly stated by a user. In a usual real world load, a client
doesn't always send requests without pausing, so the idea of having a
buffer whose life cycle if bound to the life cycle of a connection
didn't work as expected.
Memory footprint issue:
The old Netty 4 API decreased overall memory footprint by a great deal
in many cases. It was mainly because the old Netty 4 API did not
allocate a new buffer and event object for each read. Instead, it
created a new buffer for each handler in a pipeline. This works pretty
well as long as the number of handlers in a pipeline is only a few.
However, for a highly modular application with many handlers which
handles connections which lasts for relatively short period, it actually
makes the memory footprint issue much worse.
Changes:
All in all, this is about retaining all the good changes we made in 4 so
far such as better thread model and going back to the way how we dealt
with message events in 3.
To fix the memory consumption/footprint issue mentioned above, we made a
hard decision to break the backward compatibility again with the
following changes:
- Remove MessageBuf
- Merge Buf into ByteBuf
- Merge ChannelInboundByte/MessageHandler and ChannelStateHandler into ChannelInboundHandler
- Similar changes were made to the adapter classes
- Merge ChannelOutboundByte/MessageHandler and ChannelOperationHandler into ChannelOutboundHandler
- Similar changes were made to the adapter classes
- Introduce MessageList which is similar to `MessageEvent` in Netty 3
- Replace inboundBufferUpdated(ctx) with messageReceived(ctx, MessageList)
- Replace flush(ctx, promise) with write(ctx, MessageList, promise)
- Remove ByteToByteEncoder/Decoder/Codec
- Replaced by MessageToByteEncoder<ByteBuf>, ByteToMessageDecoder<ByteBuf>, and ByteMessageCodec<ByteBuf>
- Merge EmbeddedByteChannel and EmbeddedMessageChannel into EmbeddedChannel
- Add SimpleChannelInboundHandler which is sometimes more useful than
ChannelInboundHandlerAdapter
- Bring back Channel.isWritable() from Netty 3
- Add ChannelInboundHandler.channelWritabilityChanges() event
- Add RecvByteBufAllocator configuration property
- Similar to ReceiveBufferSizePredictor in Netty 3
- Some existing configuration properties such as
DatagramChannelConfig.receivePacketSize is gone now.
- Remove suspend/resumeIntermediaryDeallocation() in ByteBuf
This change would have been impossible without @normanmaurer's help. He
fixed, ported, and improved many parts of the changes.
2013-05-28 13:40:19 +02:00
|
|
|
EmbeddedChannel embedder = new EmbeddedChannel(aggr);
|
2013-04-30 20:41:20 +02:00
|
|
|
|
2014-02-20 22:41:54 +01:00
|
|
|
HttpRequest message = new DefaultHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.PUT, "http://localhost");
|
2013-04-30 20:41:20 +02:00
|
|
|
HttpHeaders.setHeader(message, "X-Test", true);
|
|
|
|
HttpHeaders.setHeader(message, "Transfer-Encoding", "Chunked");
|
|
|
|
HttpContent chunk1 = new DefaultHttpContent(Unpooled.copiedBuffer("test", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk2 = new DefaultHttpContent(Unpooled.copiedBuffer("test2", CharsetUtil.US_ASCII));
|
|
|
|
HttpContent chunk3 = LastHttpContent.EMPTY_LAST_CONTENT;
|
|
|
|
assertFalse(embedder.writeInbound(message));
|
|
|
|
assertFalse(embedder.writeInbound(chunk1));
|
|
|
|
assertFalse(embedder.writeInbound(chunk2));
|
|
|
|
|
2013-07-09 16:09:28 +02:00
|
|
|
// this should trigger a channelRead event so return true
|
2013-04-30 20:41:20 +02:00
|
|
|
assertTrue(embedder.writeInbound(chunk3));
|
|
|
|
assertTrue(embedder.finish());
|
2013-12-16 14:22:47 +01:00
|
|
|
FullHttpRequest aggratedMessage = embedder.readInbound();
|
2013-04-30 20:41:20 +02:00
|
|
|
assertNotNull(aggratedMessage);
|
|
|
|
|
2013-05-01 10:04:43 +02:00
|
|
|
assertEquals(chunk1.content().readableBytes() + chunk2.content().readableBytes(),
|
2013-04-30 21:11:41 +02:00
|
|
|
HttpHeaders.getContentLength(aggratedMessage));
|
2013-04-30 20:41:20 +02:00
|
|
|
assertEquals(aggratedMessage.headers().get("X-Test"), Boolean.TRUE.toString());
|
|
|
|
checkContentBuffer(aggratedMessage);
|
|
|
|
assertNull(embedder.readInbound());
|
|
|
|
}
|
2014-02-20 00:31:53 +01:00
|
|
|
|
|
|
|
@Test
|
|
|
|
public void testBadRequest() {
|
|
|
|
EmbeddedChannel ch = new EmbeddedChannel(new HttpRequestDecoder(), new HttpObjectAggregator(1024 * 1024));
|
|
|
|
ch.writeInbound(Unpooled.copiedBuffer("GET / HTTP/1.0 with extra\r\n", CharsetUtil.UTF_8));
|
2014-06-28 06:27:21 +02:00
|
|
|
Object inbound = ch.readInbound();
|
|
|
|
assertThat(inbound, is(instanceOf(FullHttpRequest.class)));
|
2014-07-02 12:04:11 +02:00
|
|
|
assertTrue(((DecoderResultProvider) inbound).decoderResult().isFailure());
|
2014-02-20 00:31:53 +01:00
|
|
|
assertNull(ch.readInbound());
|
|
|
|
ch.finish();
|
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
public void testBadResponse() throws Exception {
|
|
|
|
EmbeddedChannel ch = new EmbeddedChannel(new HttpResponseDecoder(), new HttpObjectAggregator(1024 * 1024));
|
|
|
|
ch.writeInbound(Unpooled.copiedBuffer("HTTP/1.0 BAD_CODE Bad Server\r\n", CharsetUtil.UTF_8));
|
2014-06-28 06:27:21 +02:00
|
|
|
Object inbound = ch.readInbound();
|
|
|
|
assertThat(inbound, is(instanceOf(FullHttpResponse.class)));
|
2014-07-02 12:04:11 +02:00
|
|
|
assertTrue(((DecoderResultProvider) inbound).decoderResult().isFailure());
|
2014-02-20 00:31:53 +01:00
|
|
|
assertNull(ch.readInbound());
|
|
|
|
ch.finish();
|
|
|
|
}
|
2012-07-03 10:37:05 +02:00
|
|
|
}
|