You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2021/03/02 01:40:15 UTC
[hadoop] branch branch-3.2 updated: HDFS-15849. ExpiredHeartbeats
metric should be of Type.COUNTER. Contributed by Qi Zhu.
This is an automated email from the ASF dual-hosted git repository.
shv pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 1d48f3b HDFS-15849. ExpiredHeartbeats metric should be of Type.COUNTER. Contributed by Qi Zhu.
1d48f3b is described below
commit 1d48f3b44c815193854e754b562dbf00a72f9b32
Author: Konstantin V Shvachko <sh...@apache.org>
AuthorDate: Mon Mar 1 16:48:48 2021 -0800
HDFS-15849. ExpiredHeartbeats metric should be of Type.COUNTER. Contributed by Qi Zhu.
(cherry picked from commit 9501c698f4789188f744f3a1fba7f1a9bb9b8aa4)
---
.../java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 3 ++-
.../src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index b543311..319a0c2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -4249,7 +4249,8 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
return blockManager.getMissingReplOneBlocksCount();
}
- @Metric({"ExpiredHeartbeats", "Number of expired heartbeats"})
+ @Metric(value = {"ExpiredHeartbeats", "Number of expired heartbeats"},
+ type = Metric.Type.COUNTER)
public int getExpiredHeartbeats() {
return datanodeStatistics.getExpiredHeartbeats();
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java
index b4d6fc9..69dbf64 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hdfs;
-import static org.apache.hadoop.test.MetricsAsserts.assertGauge;
+import static org.apache.hadoop.test.MetricsAsserts.assertCounter;
import static org.apache.hadoop.test.MetricsAsserts.getMetrics;
import static org.junit.Assert.assertEquals;
@@ -143,7 +143,7 @@ public class TestDatanodeReport {
assertReports(1, DatanodeReportType.DEAD, client, datanodes, null);
Thread.sleep(5000);
- assertGauge("ExpiredHeartbeats", 1, getMetrics("FSNamesystem"));
+ assertCounter("ExpiredHeartbeats", 1, getMetrics("FSNamesystem"));
} finally {
cluster.shutdown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org