You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2024/01/02 18:23:13 UTC
(ozone) branch master updated (f782b64022 -> dfd5cee31d)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
omit f782b64022 Add new metrics and amend test cases with them (#5905)
new dfd5cee31d HDDS-10047. Add new metrics and amend test cases with them (#5905)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f782b64022)
\
N -- N -- N refs/heads/master (dfd5cee31d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
(ozone) 01/01: HDDS-10047. Add new metrics and amend test cases with them (#5905)
Posted by ad...@apache.org.
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
commit dfd5cee31dfdb45602da874356d38d88ff722e88
Author: Zita Dombi <50...@users.noreply.github.com>
AuthorDate: Tue Jan 2 19:15:18 2024 +0100
HDDS-10047. Add new metrics and amend test cases with them (#5905)
---
.../main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java | 4 ++++
.../main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java | 4 ++++
.../java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java | 4 ++++
.../java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java | 6 ++++++
4 files changed, 18 insertions(+)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index e2cce7ac09..e9b7d220e1 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -1044,6 +1044,8 @@ public class SCMNodeManager implements NodeManager {
nodeInfo.put(s.label + stat.name(), 0L);
}
}
+ nodeInfo.put("TotalCapacity", 0L);
+ nodeInfo.put("TotalUsed", 0L);
for (DatanodeInfo node : nodeStateManager.getAllNodes()) {
String keyPrefix = "";
@@ -1078,6 +1080,8 @@ public class SCMNodeManager implements NodeManager {
nodeInfo.compute(keyPrefix + UsageMetrics.SSDUsed.name(),
(k, v) -> v + reportProto.getScmUsed());
}
+ nodeInfo.compute("TotalCapacity", (k, v) -> v + reportProto.getCapacity());
+ nodeInfo.compute("TotalUsed", (k, v) -> v + reportProto.getScmUsed());
}
}
return nodeInfo;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
index 472085fe09..bbf927fe27 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeMetrics.java
@@ -135,6 +135,7 @@ public final class SCMNodeMetrics implements MetricsSource {
public void getMetrics(MetricsCollector collector, boolean all) {
Map<String, Map<String, Integer>> nodeCount = managerMXBean.getNodeCount();
Map<String, Long> nodeInfo = managerMXBean.getNodeInfo();
+ int totalNodeCount = 0;
/**
* Loop over the Node map and create a metric for the cross product of all
* Operational and health states, ie:
@@ -152,8 +153,11 @@ public final class SCMNodeMetrics implements MetricsSource {
StringUtils.camelize(e.getKey() + "_" + h.getKey() + "_nodes"),
"Number of " + e.getKey() + " " + h.getKey() + " datanodes"),
h.getValue());
+ totalNodeCount += h.getValue();
}
}
+ metrics.addGauge(
+ Interns.info("AllNodes", "Number of datanodes"), totalNodeCount);
for (Map.Entry<String, Long> e : nodeInfo.entrySet()) {
metrics.addGauge(
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
index 24e8d5bc4f..f99669f3e6 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestSCMNodeManager.java
@@ -1982,6 +1982,10 @@ public class TestSCMNodeManager {
assertEquals(2000, stats.get("MaintenanceDiskCapacity").longValue());
assertEquals(100, stats.get("MaintenanceDiskUsed").longValue());
assertEquals(1900, stats.get("MaintenanceDiskRemaining").longValue());
+
+ // All nodes
+ assertEquals(12000, stats.get("TotalCapacity").longValue());
+ assertEquals(600, stats.get("TotalUsed").longValue());
}
/**
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
index 41a32cef43..a16914a796 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/ozone/scm/node/TestSCMNodeMetrics.java
@@ -253,6 +253,12 @@ public class TestSCMNodeMetrics {
getMetrics(SCMNodeMetrics.class.getSimpleName()));
assertGauge("DecommissionedSSDRemaining", 0L,
getMetrics(SCMNodeMetrics.class.getSimpleName()));
+ assertGauge("AllNodes", 1,
+ getMetrics(SCMNodeMetrics.class.getSimpleName()));
+ assertGauge("TotalCapacity", 100L,
+ getMetrics(SCMNodeMetrics.class.getSimpleName()));
+ assertGauge("TotalUsed", 10L,
+ getMetrics(SCMNodeMetrics.class.getSimpleName()));
LayoutVersionManager versionManager = nodeManager.getLayoutVersionManager();
LayoutVersionProto layoutInfo = LayoutVersionProto.newBuilder()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org