Free up allocated buffers in Netty4HttpServerTransportTests (#99005) (#…

…99037) Closes #98869
elastic · Aug 30, 2023 · 82490eb · 82490eb
1 parent 9d448a0
commit 82490eb
Showing 1 changed file with 50 additions and 42 deletions.
diff --git a/...rt-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpHeaderValidatorTests.java b/...rt-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpHeaderValidatorTests.java
@@ -632,60 +632,68 @@ public void testFullRequestValidationSuccess() {
         assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
 
         ByteBuf buf = channel.alloc().buffer();
-        ByteBufUtil.copy(AsciiString.of("test full http request"), buf);
-        final DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/uri", buf);
-        channel.writeInbound(request);
+        try {
+            ByteBufUtil.copy(AsciiString.of("test full http request"), buf);
+            final DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/uri", buf);
+            channel.writeInbound(request);
 
-        // request got through to validation
-        assertThat(header.get(), sameInstance(request));
-        // channel is paused
-        assertThat(channel.readInbound(), nullValue());
-        assertFalse(channel.config().isAutoRead());
+            // request got through to validation
+            assertThat(header.get(), sameInstance(request));
+            // channel is paused
+            assertThat(channel.readInbound(), nullValue());
+            assertFalse(channel.config().isAutoRead());
 
-        // validation succeeds
-        listener.get().onResponse(null);
-        channel.runPendingTasks();
+            // validation succeeds
+            listener.get().onResponse(null);
+            channel.runPendingTasks();
 
-        // channel is resumed and waiting for next request
-        assertTrue(channel.config().isAutoRead());
-        assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
+            // channel is resumed and waiting for next request
+            assertTrue(channel.config().isAutoRead());
+            assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
 
-        DefaultFullHttpRequest throughRequest = channel.readInbound();
-        // request goes through unaltered
-        assertThat(throughRequest, sameInstance(request));
-        assertFalse(throughRequest.decoderResult().isFailure());
-        // the content is unaltered
-        assertThat(new String(ByteBufUtil.getBytes(throughRequest.content()), StandardCharsets.UTF_8), is("test full http request"));
-        assertThat(buf.refCnt(), is(1));
-        assertThat(throughRequest.decoderResult().cause(), nullValue());
+            DefaultFullHttpRequest throughRequest = channel.readInbound();
+            // request goes through unaltered
+            assertThat(throughRequest, sameInstance(request));
+            assertFalse(throughRequest.decoderResult().isFailure());
+            // the content is unaltered
+            assertThat(new String(ByteBufUtil.getBytes(throughRequest.content()), StandardCharsets.UTF_8), is("test full http request"));
+            assertThat(buf.refCnt(), is(1));
+            assertThat(throughRequest.decoderResult().cause(), nullValue());
+        } finally {
+            buf.release();
+        }
     }
 
     public void testFullRequestWithDecoderException() {
         assertTrue(channel.config().isAutoRead());
         assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
 
         ByteBuf buf = channel.alloc().buffer();
-        ByteBufUtil.copy(AsciiString.of("test full http request"), buf);
-        // a request with a decoder error prior to validation
-        final DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/uri", buf);
-        Exception cause = new ElasticsearchException("Boom");
-        request.setDecoderResult(DecoderResult.failure(cause));
-        channel.writeInbound(request);
+        try {
+            ByteBufUtil.copy(AsciiString.of("test full http request"), buf);
+            // a request with a decoder error prior to validation
+            final DefaultFullHttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, HttpMethod.GET, "/uri", buf);
+            Exception cause = new ElasticsearchException("Boom");
+            request.setDecoderResult(DecoderResult.failure(cause));
+            channel.writeInbound(request);
 
-        // request goes through without invoking the validator
-        assertThat(header.get(), nullValue());
-        assertThat(listener.get(), nullValue());
-        // channel is NOT paused
-        assertTrue(channel.config().isAutoRead());
-        assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
+            // request goes through without invoking the validator
+            assertThat(header.get(), nullValue());
+            assertThat(listener.get(), nullValue());
+            // channel is NOT paused
+            assertTrue(channel.config().isAutoRead());
+            assertThat(netty4HttpHeaderValidator.getState(), equalTo(WAITING_TO_START));
 
-        DefaultFullHttpRequest throughRequest = channel.readInbound();
-        // request goes through unaltered
-        assertThat(throughRequest, sameInstance(request));
-        assertTrue(throughRequest.decoderResult().isFailure());
-        assertThat(throughRequest.decoderResult().cause(), equalTo(cause));
-        // the content is unaltered
-        assertThat(new String(ByteBufUtil.getBytes(throughRequest.content()), StandardCharsets.UTF_8), is("test full http request"));
-        assertThat(buf.refCnt(), is(1));
+            DefaultFullHttpRequest throughRequest = channel.readInbound();
+            // request goes through unaltered
+            assertThat(throughRequest, sameInstance(request));
+            assertTrue(throughRequest.decoderResult().isFailure());
+            assertThat(throughRequest.decoderResult().cause(), equalTo(cause));
+            // the content is unaltered
+            assertThat(new String(ByteBufUtil.getBytes(throughRequest.content()), StandardCharsets.UTF_8), is("test full http request"));
+            assertThat(buf.refCnt(), is(1));
+        } finally {
+            buf.release();
+        }
     }
 }