This is an automated email from the ASF dual-hosted git repository.
ferhui pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8e9ad2d Revert "HADOOP-17995. Stale record should be remove when
DataNodePeerMetrics#dumpSendPacketDownstreamAvgInfoAsJson (#3630)" (#3697)
8e9ad2d is described below
commit 8e9ad2d7af31422a8e9e44d2b804c87865958a8b
Author: Hui Fei <fer...@apache.org>
AuthorDate: Mon Nov 22 10:05:21 2021 +0800
Revert "HADOOP-17995. Stale record should be remove when
DataNodePeerMetrics#dumpSendPacketDownstreamAvgInfoAsJson (#3630)" (#3697)
---
.../org/apache/hadoop/metrics2/lib/MutableRollingAverages.java | 7 ++-----
.../hadoop/hdfs/server/datanode/TestDataNodePeerMetrics.java | 10 ----------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
index 3217add..193ed0f 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/lib/MutableRollingAverages.java
@@ -179,11 +179,8 @@ public class MutableRollingAverages extends MutableMetric
implements Closeable {
long totalCount = 0;
for (final SumAndCount sumAndCount : entry.getValue()) {
- if (Time.monotonicNow() - sumAndCount.getSnapshotTimeStamp()
- < recordValidityMs) {
- totalCount += sumAndCount.getCount();
- totalSum += sumAndCount.getSum();
- }
+ totalCount += sumAndCount.getCount();
+ totalSum += sumAndCount.getSum();
}
if (totalCount != 0) {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodePeerMetrics.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodePeerMetrics.java
index 9ea8a08..41fb41f 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodePeerMetrics.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodePeerMetrics.java
@@ -122,16 +122,10 @@ public class TestDataNodePeerMetrics {
GenericTestUtils.waitFor(
() -> rollingAverages.getStats(numSamples).size() > 0, 500, 5000);
assertEquals(3, rollingAverages.getStats(numSamples).size());
- String json = peerMetrics.dumpSendPacketDownstreamAvgInfoAsJson();
- for (String peerAddr : peerAddrList) {
- assertThat(json, containsString(peerAddr));
- }
/* wait for stale report to be removed */
GenericTestUtils.waitFor(
() -> rollingAverages.getStats(numSamples).isEmpty(), 500, 10000);
assertEquals(0, rollingAverages.getStats(numSamples).size());
- json = peerMetrics.dumpSendPacketDownstreamAvgInfoAsJson();
- assertEquals("{}", json);
/* dn can report peer metrics normally when it added back to cluster */
for (String peerAddr : peerAddrList) {
@@ -144,10 +138,6 @@ public class TestDataNodePeerMetrics {
GenericTestUtils.waitFor(
() -> rollingAverages.getStats(numSamples).size() > 0, 500, 10000);
assertEquals(3, rollingAverages.getStats(numSamples).size());
- json = peerMetrics.dumpSendPacketDownstreamAvgInfoAsJson();
- for (String peerAddr : peerAddrList) {
- assertThat(json, containsString(peerAddr));
- }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
