Skip to content

[ISSUE #10398] Fix native memory leak on TLS certificate hot-reload #10399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qianye1001 wants to merge 2 commits into
base: develop
Choose a base branch
from
+28 −4
Open

[ISSUE #10398] Fix native memory leak on TLS certificate hot-reload #10399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2791184
[ISSUE #10398] Fix TLS certificate hot-reload native memory leak by r…
web-flow May 28, 2026
382e260
fix: add missing SslContext import in NettyRemotingServer for PR #103…
web-flow May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions proxy/src/main/java/org/apache/rocketmq/proxy/grpc/ProxyAndTlsProtocolNegotiator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import io.grpc.netty.shaded.io.netty.handler.ssl.util.SelfSignedCertificate;
import io.grpc.netty.shaded.io.netty.util.AsciiString;
import io.grpc.netty.shaded.io.netty.util.CharsetUtil;
import io.grpc.netty.shaded.io.netty.util.ReferenceCountUtil;

import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -77,7 +78,7 @@ public class ProxyAndTlsProtocolNegotiator implements InternalProtocolNegotiator
*/
private static final int SSL_RECORD_HEADER_LENGTH = 5;

private static SslContext sslContext;
private static volatile SslContext sslContext;

public ProxyAndTlsProtocolNegotiator() {
try {
Expand Down Expand Up @@ -113,9 +114,10 @@ public static void loadSslContext() throws CertificateException, IOException {
provider = SslProvider.JDK;
log.info("Using JDK SSL provider");
}
SslContext newSslContext;
if (proxyConfig.isTlsTestModeEnable()) {
SelfSignedCertificate selfSignedCertificate = new SelfSignedCertificate();
sslContext = GrpcSslContexts.forServer(selfSignedCertificate.certificate(), selfSignedCertificate.privateKey())
newSslContext = GrpcSslContexts.forServer(selfSignedCertificate.certificate(), selfSignedCertificate.privateKey())
.sslProvider(provider)
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.clientAuth(ClientAuth.NONE)
Expand All @@ -128,14 +130,24 @@ public static void loadSslContext() throws CertificateException, IOException {
Paths.get(tlsKeyPath));
InputStream serverCertificateStream = Files.newInputStream(
Paths.get(tlsCertPath))) {
sslContext = GrpcSslContexts.forServer(serverCertificateStream,
newSslContext = GrpcSslContexts.forServer(serverCertificateStream,
serverKeyInputStream,
StringUtils.isNotBlank(tlsKeyPassword) ? tlsKeyPassword : null)
.trustManager(InsecureTrustManagerFactory.INSTANCE)
.clientAuth(ClientAuth.NONE)
.build();
}
}
SslContext oldSslContext = sslContext;
sslContext = newSslContext;
if (oldSslContext != null) {
try {
ReferenceCountUtil.release(oldSslContext);
log.info("Old SslContext released for proxy server");
} catch (Exception e) {
log.warn("Failed to release old SslContext for proxy server", e);
}
}
}

private class ProxyAndTlsProtocolHandler extends ByteToMessageDecoder {
Expand Down
14 changes: 13 additions & 1 deletion remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import io.netty.handler.codec.haproxy.HAProxyMessageDecoder;
import io.netty.handler.codec.haproxy.HAProxyProtocolVersion;
import io.netty.handler.codec.haproxy.HAProxyTLV;
import io.netty.handler.ssl.SslContext;
import io.netty.handler.timeout.IdleState;
import io.netty.handler.timeout.IdleStateEvent;
import io.netty.handler.timeout.IdleStateHandler;
Expand All @@ -53,6 +54,7 @@
import io.netty.util.HashedWheelTimer;
import io.netty.util.Timeout;
import io.netty.util.TimerTask;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -183,7 +185,17 @@ public void loadSslContext() {

if (tlsMode != TlsMode.DISABLED) {
try {
sslContext = TlsHelper.buildSslContext(false);
SslContext newSslContext = TlsHelper.buildSslContext(false);
SslContext oldSslContext = this.sslContext;
this.sslContext = newSslContext;
if (oldSslContext != null) {
try {
ReferenceCountUtil.release(oldSslContext);
log.info("Old SslContext released for server");
} catch (Exception e) {
log.warn("Failed to release old SslContext for server", e);
}
}
log.info("SslContext created for server");
} catch (CertificateException | IOException e) {
log.error("Failed to create SslContext for server", e);
Expand Down
Loading