This is an automated email from the ASF dual-hosted git repository.
Aias00 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 562017c32f fix(mcp): release collected response buffers (#7203)
562017c32f is described below
commit 562017c32f9e8509ea229c30268385e441be35f4
Author: Liming Deng <[email protected]>
AuthorDate: Sat Oct 10 09:46:04 2026 +0800
fix(mcp): release collected response buffers (#7203)
---
.../NonCommittingMcpResponseDecorator.java | 15 +++-
.../NonCommittingMcpResponseDecoratorTest.java | 86 ++++++++++++++++++++++
2 files changed, 97 insertions(+), 4 deletions(-)
diff --git
a/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecorator.java
b/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecorator.java
index 233f07e77a..23c759ac81 100644
---
a/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecorator.java
+++
b/shenyu-plugin/shenyu-plugin-mcp-server/src/main/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecorator.java
@@ -23,6 +23,7 @@ import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferUtils;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.http.server.reactive.ServerHttpResponseDecorator;
import reactor.core.publisher.Flux;
@@ -83,6 +84,7 @@ public class NonCommittingMcpResponseDecorator extends
ServerHttpResponseDecorat
return Flux.from(body)
.collectList()
+ .doOnDiscard(DataBuffer.class, DataBufferUtils::release)
.doOnNext(this::processResponseData)
.then()
.doOnSuccess(aVoid -> LOG.debug("Successfully completed
writeWith for session: {}", sessionId))
@@ -96,6 +98,7 @@ public class NonCommittingMcpResponseDecorator extends
ServerHttpResponseDecorat
return Flux.from(body)
.flatMap(Flux::from)
.collectList()
+ .doOnDiscard(DataBuffer.class, DataBufferUtils::release)
.doOnNext(this::processResponseData)
.then()
.doOnSuccess(aVoid -> LOG.debug("Successfully completed
writeAndFlushWith for session: {}", sessionId))
@@ -146,10 +149,14 @@ public class NonCommittingMcpResponseDecorator extends
ServerHttpResponseDecorat
private String aggregateDataBuffers(final java.util.List<? extends
DataBuffer> dataBuffers) {
final StringBuilder responseBuilder = new StringBuilder();
- for (DataBuffer buffer : dataBuffers) {
- final byte[] bytes = new byte[buffer.readableByteCount()];
- buffer.read(bytes);
- responseBuilder.append(new String(bytes, StandardCharsets.UTF_8));
+ try {
+ for (DataBuffer buffer : dataBuffers) {
+ final byte[] bytes = new byte[buffer.readableByteCount()];
+ buffer.read(bytes);
+ responseBuilder.append(new String(bytes,
StandardCharsets.UTF_8));
+ }
+ } finally {
+ dataBuffers.forEach(DataBufferUtils::release);
}
return responseBuilder.toString();
diff --git
a/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecoratorTest.java
b/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecoratorTest.java
new file mode 100644
index 0000000000..5f1484a2ca
--- /dev/null
+++
b/shenyu-plugin/shenyu-plugin-mcp-server/src/test/java/org/apache/shenyu/plugin/mcp/server/response/NonCommittingMcpResponseDecoratorTest.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF 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 org.apache.shenyu.plugin.mcp.server.response;
+
+import io.netty.buffer.PooledByteBufAllocator;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.core.io.buffer.NettyDataBuffer;
+import org.springframework.core.io.buffer.NettyDataBufferFactory;
+import org.springframework.mock.http.server.reactive.MockServerHttpResponse;
+import reactor.core.publisher.Mono;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.CompletableFuture;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test cases for {@link NonCommittingMcpResponseDecorator}.
+ */
+public final class NonCommittingMcpResponseDecoratorTest {
+
+ @ParameterizedTest
+ @ValueSource(booleans = {false, true})
+ void releasesCollectedBufferOnUpstreamError(final boolean flush) {
+ NettyDataBuffer buffer = new
NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT).allocateBuffer();
+ buffer.write("partial".getBytes(StandardCharsets.UTF_8));
+ CompletableFuture<String> future = new CompletableFuture<>();
+ NonCommittingMcpResponseDecorator decorator = new
NonCommittingMcpResponseDecorator(new MockServerHttpResponse(), "session",
future, null);
+ IllegalStateException failure = new IllegalStateException("upstream
failed");
+ Flux<NettyDataBuffer> body = Flux.concat(Mono.just(buffer),
Mono.error(failure));
+
+ StepVerifier.create(flush ?
decorator.writeAndFlushWith(Flux.just(body)) : decorator.writeWith(body))
+ .expectErrorMatches(error -> error == failure).verify();
+
+ assertEquals(0, buffer.getNativeBuffer().refCnt());
+ assertTrue(future.isCompletedExceptionally());
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {false, true})
+ void releasesCollectedBufferOnCancellation(final boolean flush) {
+ NettyDataBuffer buffer = new
NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT).allocateBuffer();
+ buffer.write("partial".getBytes(StandardCharsets.UTF_8));
+ NonCommittingMcpResponseDecorator decorator = new
NonCommittingMcpResponseDecorator(new MockServerHttpResponse(), "session", new
CompletableFuture<>(), null);
+ Flux<NettyDataBuffer> body = Flux.concat(Mono.just(buffer),
Mono.never());
+
+ StepVerifier.create(flush ?
decorator.writeAndFlushWith(Flux.just(body)) : decorator.writeWith(body))
+ .thenCancel().verify();
+
+ assertEquals(0, buffer.getNativeBuffer().refCnt());
+ }
+
+ @Test
+ public void testWriteWithReleasesCollectedBuffers() {
+ NettyDataBufferFactory bufferFactory = new
NettyDataBufferFactory(PooledByteBufAllocator.DEFAULT);
+ NettyDataBuffer buffer = (NettyDataBuffer)
bufferFactory.wrap("response".getBytes(StandardCharsets.UTF_8));
+ CompletableFuture<String> responseFuture = new CompletableFuture<>();
+ NonCommittingMcpResponseDecorator decorator = new
NonCommittingMcpResponseDecorator(
+ new MockServerHttpResponse(), "session", responseFuture, null);
+
+ decorator.writeWith(Mono.just(buffer)).block();
+
+ assertEquals("response", responseFuture.join());
+ assertEquals(0, buffer.getNativeBuffer().refCnt());
+ }
+}
