This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 9993049f30 HDDS-11100. OM/SCM support displaying Netty off-heap memory
metrics (#6900)
9993049f30 is described below
commit 9993049f3028c215e8ae52bb03e843481a83c022
Author: slfan1989 <[email protected]>
AuthorDate: Sat Jul 13 00:10:58 2024 +0800
HDDS-11100. OM/SCM support displaying Netty off-heap memory metrics (#6900)
---
.../org/apache/hadoop/hdds/scm/server/StorageContainerManager.java | 4 ++++
.../org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java | 7 +++++++
2 files changed, 11 insertions(+)
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 63cce60bcf..5c0248f162 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -146,6 +146,7 @@ import org.apache.hadoop.hdds.server.events.EventPublisher;
import org.apache.hadoop.hdds.server.events.EventQueue;
import org.apache.hadoop.hdds.upgrade.HDDSLayoutVersionManager;
import org.apache.hadoop.hdds.utils.HddsVersionInfo;
+import org.apache.hadoop.hdds.utils.NettyMetrics;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.LegacyHadoopConfigurationSource;
import org.apache.hadoop.ipc.RPC;
@@ -236,6 +237,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
private static SCMMetrics metrics;
private static SCMPerformanceMetrics perfMetrics;
private SCMHAMetrics scmHAMetrics;
+ private final NettyMetrics nettyMetrics;
/*
* RPC Endpoints exposed by SCM.
@@ -456,6 +458,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
registerMXBean();
registerMetricsSource(this);
+ this.nettyMetrics = NettyMetrics.create();
}
private void initializeEventHandlers() {
@@ -1710,6 +1713,7 @@ public final class StorageContainerManager extends
ServiceRuntimeInfoImpl
metrics.unRegister();
}
+ nettyMetrics.unregister();
if (perfMetrics != null) {
perfMetrics.unRegister();
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
index ada061876e..463afba942 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hadoop.hdds.utils.NettyMetrics;
import org.apache.hadoop.hdds.utils.TransactionInfo;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneManager;
@@ -100,6 +101,8 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
/** The last index skipped by {@link #notifyTermIndexUpdated(long, long)}. */
private volatile long lastSkippedIndex = RaftLog.INVALID_LOG_INDEX;
+ private final NettyMetrics nettyMetrics;
+
public OzoneManagerStateMachine(OzoneManagerRatisServer ratisServer,
boolean isTracingEnabled) throws IOException {
this.isTracingEnabled = isTracingEnabled;
@@ -120,6 +123,7 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
.setNameFormat(threadPrefix + "InstallSnapshotThread").build();
this.installSnapshotExecutor =
HadoopExecutors.newSingleThreadExecutor(installSnapshotThreadFactory);
+ this.nettyMetrics = NettyMetrics.create();
}
/**
@@ -620,6 +624,9 @@ public class OzoneManagerStateMachine extends
BaseStateMachine {
ozoneManagerDoubleBuffer.stop();
HadoopExecutors.shutdown(executorService, LOG, 5, TimeUnit.SECONDS);
HadoopExecutors.shutdown(installSnapshotExecutor, LOG, 5,
TimeUnit.SECONDS);
+ if (this.nettyMetrics != null) {
+ this.nettyMetrics.unregister();
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
