Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-15849. ExpiredHeartbeats metric should be of Type.COUNTER. Contributed by Qi Zhu. 

(cherry picked from commit 9501c698f4)
This commit is contained in:
Konstantin V Shvachko 2021-03-01 16:48:48 -08:00
parent 24a0304159
commit 56679e83bf
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
View File

@ -4560,7 +4560,8 @@ public class FSNamesystem implements Namesystem, FSNamesystemMBean,
return blockManager.getMissingReplOneBlocksCount(); return blockManager.getMissingReplOneBlocksCount();
} }
@Metric({"ExpiredHeartbeats", "Number of expired heartbeats"}) @Metric(value = {"ExpiredHeartbeats", "Number of expired heartbeats"},
type = Metric.Type.COUNTER)
public int getExpiredHeartbeats() { public int getExpiredHeartbeats() {
return datanodeStatistics.getExpiredHeartbeats(); return datanodeStatistics.getExpiredHeartbeats();
} }

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDatanodeReport.java
View File

@ -17,7 +17,7 @@
*/ */
package org.apache.hadoop.hdfs; 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.apache.hadoop.test.MetricsAsserts.getMetrics;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -143,7 +143,7 @@ public class TestDatanodeReport {
assertReports(1, DatanodeReportType.DEAD, client, datanodes, null); assertReports(1, DatanodeReportType.DEAD, client, datanodes, null);
Thread.sleep(5000); Thread.sleep(5000);
assertGauge("ExpiredHeartbeats", 1, getMetrics("FSNamesystem")); assertCounter("ExpiredHeartbeats", 1, getMetrics("FSNamesystem"));
} finally { } finally {
cluster.shutdown(); cluster.shutdown();
} }