natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory leak (#14127)

This commit is contained in:
TomlongTK 2024-05-08 14:08:57 +08:00 committed by GitHub
parent 1686383ced
commit 487fa4f7c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/AbstractServerHttpChannelObserver.java
View File

@ -162,8 +162,13 @@ public abstract class AbstractServerHttpChannelObserver implements CustomizableH
data = ((HttpResult<?>) data).getBody();
}
HttpOutputMessage outputMessage = encodeHttpOutputMessage(data);
preOutputMessage(outputMessage);
responseEncoder.encode(outputMessage.getBody(), data);
try {
preOutputMessage(outputMessage);
responseEncoder.encode(outputMessage.getBody(), data);
} catch (Throwable t) {
outputMessage.close();
throw t;
}
return outputMessage;
}

8
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpInputMessage.java
View File

@ -16,9 +16,15 @@
*/
package org.apache.dubbo.remoting.http12;
import java.io.IOException;
import java.io.InputStream;
public interface HttpInputMessage {
public interface HttpInputMessage extends AutoCloseable {
InputStream getBody();
@Override
default void close() throws IOException {
getBody().close();
}
}

8
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/HttpOutputMessage.java
View File

@ -17,9 +17,10 @@
package org.apache.dubbo.remoting.http12;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
public interface HttpOutputMessage {
public interface HttpOutputMessage extends AutoCloseable {
HttpOutputMessage EMPTY_MESSAGE = new HttpOutputMessage() {
@ -32,4 +33,9 @@ public interface HttpOutputMessage {
};
OutputStream getBody();
@Override
default void close() throws IOException {
getBody().close();
}
}

6
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/DefaultHttp1Request.java
View File

@ -20,6 +20,7 @@ import org.apache.dubbo.remoting.http12.HttpHeaders;
import org.apache.dubbo.remoting.http12.HttpInputMessage;
import org.apache.dubbo.remoting.http12.RequestMetadata;
import java.io.IOException;
import java.io.InputStream;
public class DefaultHttp1Request implements Http1Request {
@ -52,4 +53,9 @@ public class DefaultHttp1Request implements Http1Request {
public String path() {
return httpMetadata.path();
}
@Override
public void close() throws IOException {
httpInputMessage.close();
}
}

6
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/DefaultHttp1Response.java
View File

@ -20,6 +20,7 @@ import org.apache.dubbo.remoting.http12.HttpHeaders;
import org.apache.dubbo.remoting.http12.HttpInputMessage;
import org.apache.dubbo.remoting.http12.HttpMetadata;
import java.io.IOException;
import java.io.InputStream;
public class DefaultHttp1Response implements HttpMetadata, HttpInputMessage {
@ -42,4 +43,9 @@ public class DefaultHttp1Response implements HttpMetadata, HttpInputMessage {
public HttpHeaders headers() {
return httpMetadata.headers();
}
@Override
public void close() throws IOException {
httpInputMessage.close();
}
}

11
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h1/Http1OutputMessage.java
View File

@ -18,8 +18,11 @@ package org.apache.dubbo.remoting.http12.h1;
import org.apache.dubbo.remoting.http12.HttpOutputMessage;
import java.io.IOException;
import java.io.OutputStream;
import io.netty.buffer.ByteBufOutputStream;
public class Http1OutputMessage implements HttpOutputMessage {
private final OutputStream outputStream;
@ -32,4 +35,12 @@ public class Http1OutputMessage implements HttpOutputMessage {
public OutputStream getBody() {
return outputStream;
}
@Override
public void close() throws IOException {
if (outputStream instanceof ByteBufOutputStream) {
((ByteBufOutputStream) outputStream).buffer().release();
}
outputStream.close();
}
}

11
dubbo-remoting/dubbo-remoting-http12/src/main/java/org/apache/dubbo/remoting/http12/h2/Http2OutputMessageFrame.java
View File

@ -16,8 +16,11 @@
*/
package org.apache.dubbo.remoting.http12.h2;
import java.io.IOException;
import java.io.OutputStream;
import io.netty.buffer.ByteBufOutputStream;
public class Http2OutputMessageFrame implements Http2OutputMessage {
private final OutputStream body;
@ -42,6 +45,14 @@ public class Http2OutputMessageFrame implements Http2OutputMessage {
return body;
}
@Override
public void close() throws IOException {
if (body instanceof ByteBufOutputStream) {
((ByteBufOutputStream) body).buffer().release();
}
body.close();
}
@Override
public boolean isEndStream() {
return endStream;

16
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/AbstractServerTransportListener.java
View File

@ -126,7 +126,9 @@ public abstract class AbstractServerTransportListener<HEADER extends RequestMeta
doOnData(message);
} catch (Throwable t) {
logError(t);
onError(t);
onError(message, t);
} finally {
onFinally(message);
}
});
}
@ -184,6 +186,18 @@ public abstract class AbstractServerTransportListener<HEADER extends RequestMeta
throw new HttpStatusException(HttpStatus.INTERNAL_SERVER_ERROR.getCode(), throwable);
}
protected void onError(MESSAGE message, Throwable throwable) {
onError(throwable);
}
protected void onFinally(MESSAGE message) {
try {
message.close();
} catch (Exception e) {
onError(e);
}
}
protected RpcInvocation buildRpcInvocation(RpcInvocationBuildContext context) {
MethodDescriptor methodDescriptor = context.getMethodDescriptor();
if (methodDescriptor == null) {

14
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/grpc/GrpcHttp2ServerTransportListener.java
View File

@ -26,6 +26,7 @@ import org.apache.dubbo.remoting.http12.exception.DecodeException;
import org.apache.dubbo.remoting.http12.exception.UnimplementedException;
import org.apache.dubbo.remoting.http12.h2.H2StreamChannel;
import org.apache.dubbo.remoting.http12.h2.Http2Header;
import org.apache.dubbo.remoting.http12.h2.Http2InputMessage;
import org.apache.dubbo.remoting.http12.h2.Http2TransportListener;
import org.apache.dubbo.remoting.http12.message.MethodMetadata;
import org.apache.dubbo.remoting.http12.message.StreamingDecoder;
@ -122,6 +123,19 @@ public class GrpcHttp2ServerTransportListener extends GenericHttp2ServerTranspor
return invocation;
}
@Override
protected void onError(Http2InputMessage message, Throwable throwable) {
try {
message.close();
} catch (Exception e) {
throwable.addSuppressed(e);
}
onError(throwable);
}
@Override
protected void onFinally(Http2InputMessage message) {}
@Override
protected GrpcStreamingDecoder getStreamingDecoder() {
return (GrpcStreamingDecoder) super.getStreamingDecoder();

3
dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/h12/http2/GenericHttp2ServerTransportListener.java
View File

@ -86,6 +86,7 @@ public class GenericHttp2ServerTransportListener extends AbstractServerTransport
return new SerializingExecutor(executorSupport.getExecutor(metadata));
}
@Override
protected void doOnMetadata(Http2Header metadata) {
if (metadata.isEndStream()) {
if (!HttpMethods.supportBody(metadata.method())) {
@ -164,7 +165,7 @@ public class GenericHttp2ServerTransportListener extends AbstractServerTransport
@Override
protected void onDataCompletion(Http2InputMessage message) {
if (message.isEndStream()) {
serverCallListener.onComplete();
getStreamingDecoder().close();
}
}