From ed01c52c409b8baeee681f343b9657560f51deb2 Mon Sep 17 00:00:00 2001 From: Ivan Andika Date: Mon, 17 Nov 2025 13:07:14 +0800 Subject: [PATCH 1/2] HDDS-13944. S3G Metrics support displaying Netty off-heap memory --- .../src/main/java/org/apache/hadoop/ozone/s3/Gateway.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java index 9126d8ed4a2b..e48c287f0bf7 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hdds.server.http.BaseHttpServer; import org.apache.hadoop.hdds.tracing.TracingUtil; import org.apache.hadoop.hdds.utils.HddsServerUtil; +import org.apache.hadoop.hdds.utils.NettyMetrics; import org.apache.hadoop.ozone.OzoneSecurityUtil; import org.apache.hadoop.ozone.s3.metrics.S3GatewayMetrics; import org.apache.hadoop.ozone.util.OzoneNetUtils; @@ -61,6 +62,7 @@ public class Gateway extends GenericCli implements Callable { /** Servlets and static content on separate port. */ private BaseHttpServer contentServer; private S3GatewayMetrics metrics; + private NettyMetrics nettyMetrics; private final JvmPauseMonitor jvmPauseMonitor = newJvmPauseMonitor("S3G"); @@ -81,6 +83,7 @@ public Void call() throws Exception { httpServer = new S3GatewayHttpServer(OzoneConfigurationHolder.configuration(), "s3gateway"); contentServer = new S3GatewayWebAdminServer(OzoneConfigurationHolder.configuration(), "s3g-web"); metrics = S3GatewayMetrics.create(OzoneConfigurationHolder.configuration()); + nettyMetrics = NettyMetrics.create(); start(); ShutdownHookManager.get().addShutdownHook(() -> { @@ -111,7 +114,11 @@ public void stop() throws Exception { httpServer.stop(); contentServer.stop(); jvmPauseMonitor.stop(); + metrics.close(); S3GatewayMetrics.unRegister(); + if (nettyMetrics != null) { + nettyMetrics.unregister(); + } } private static void loginS3GUser(OzoneConfiguration conf) From a25683da14ae89e64aecf69aa5dc661abbbf7e04 Mon Sep 17 00:00:00 2001 From: Ivan Andika Date: Tue, 18 Nov 2025 08:55:14 +0800 Subject: [PATCH 2/2] Removing unnecessary close --- .../src/main/java/org/apache/hadoop/ozone/s3/Gateway.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java index e48c287f0bf7..7b8dd58e2e28 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/Gateway.java @@ -114,7 +114,6 @@ public void stop() throws Exception { httpServer.stop(); contentServer.stop(); jvmPauseMonitor.stop(); - metrics.close(); S3GatewayMetrics.unRegister(); if (nettyMetrics != null) { nettyMetrics.unregister();