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 in...@apache.org on 2020/03/13 00:22:27 UTC
[hadoop] branch trunk updated: HDFS-14612. SlowDiskReport won't
update when SlowDisks is always empty in heartbeat. Contributed by Haibin
Huang.
This is an automated email from the ASF dual-hosted git repository.
inigoiri 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 0695f7a HDFS-14612. SlowDiskReport won't update when SlowDisks is always empty in heartbeat. Contributed by Haibin Huang.
0695f7a is described below
commit 0695f7a538fb81cc5e36d0b9187df39822bb24f4
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Thu Mar 12 17:22:11 2020 -0700
HDFS-14612. SlowDiskReport won't update when SlowDisks is always empty in heartbeat. Contributed by Haibin Huang.
---
.../server/blockmanagement/DatanodeManager.java | 1 +
.../server/blockmanagement/SlowDiskTracker.java | 3 +-
.../blockmanagement/TestSlowDiskTracker.java | 50 ++++++++++++++++++++++
3 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index 6ec9d18..f5cf1d5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -1780,6 +1780,7 @@ public class DatanodeManager {
}
slowDiskTracker.addSlowDiskReport(nodeReg.getIpcAddr(false), slowDisks);
}
+ slowDiskTracker.checkAndUpdateReportIfNecessary();
}
if (!cmds.isEmpty()) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
index d0d1ee4..894121e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/SlowDiskTracker.java
@@ -135,10 +135,9 @@ public class SlowDiskTracker {
diskIDLatencyMap.put(diskID, diskLatency);
}
- checkAndUpdateReportIfNecessary();
}
- private void checkAndUpdateReportIfNecessary() {
+ public void checkAndUpdateReportIfNecessary() {
// Check if it is time for update
long now = timer.monotonicNow();
if (now - lastUpdateTime > reportGenerationIntervalMs) {
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSlowDiskTracker.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSlowDiskTracker.java
index 78cf927..63f37b9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSlowDiskTracker.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSlowDiskTracker.java
@@ -19,6 +19,7 @@
package org.apache.hadoop.hdfs.server.blockmanagement;
import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -56,6 +57,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -401,6 +403,46 @@ public class TestSlowDiskTracker {
assertTrue(tracker.getSlowDiskReportAsJsonString() == null);
}
+ @Test
+ public void testRemoveInvalidReport() throws Exception {
+ MiniDFSCluster cluster =
+ new MiniDFSCluster.Builder(conf).numDataNodes(2).build();
+ try {
+ NameNode nn = cluster.getNameNode(0);
+
+ DatanodeManager datanodeManager =
+ nn.getNamesystem().getBlockManager().getDatanodeManager();
+ SlowDiskTracker slowDiskTracker = datanodeManager.getSlowDiskTracker();
+ slowDiskTracker.setReportValidityMs(OUTLIERS_REPORT_INTERVAL * 3);
+ assertTrue(slowDiskTracker.getSlowDisksReport().isEmpty());
+ slowDiskTracker.addSlowDiskReport(
+ "dn1",
+ generateSlowDiskReport("disk1",
+ Collections.singletonMap(DiskOp.WRITE, 1.3)));
+ slowDiskTracker.addSlowDiskReport(
+ "dn2",
+ generateSlowDiskReport("disk2",
+ Collections.singletonMap(DiskOp.WRITE, 1.1)));
+
+ // wait for slow disk report
+ GenericTestUtils.waitFor(() -> !slowDiskTracker.getSlowDisksReport()
+ .isEmpty(), 500, 5000);
+ Map<String, DiskLatency> slowDisksReport =
+ getSlowDisksReportForTesting(slowDiskTracker);
+ assertEquals(2, slowDisksReport.size());
+
+ // wait for invalid report to be removed
+ Thread.sleep(OUTLIERS_REPORT_INTERVAL * 3);
+ GenericTestUtils.waitFor(() -> slowDiskTracker.getSlowDisksReport()
+ .isEmpty(), 500, 5000);
+ slowDisksReport = getSlowDisksReportForTesting(slowDiskTracker);
+ assertEquals(0, slowDisksReport.size());
+
+ } finally {
+ cluster.shutdown();
+ }
+ }
+
private boolean isDiskInReports(ArrayList<DiskLatency> reports,
String dataNodeID, String disk, DiskOp diskOp, double latency) {
String diskID = SlowDiskTracker.getSlowDiskIDForReport(dataNodeID, disk);
@@ -430,6 +472,14 @@ public class TestSlowDiskTracker {
tracker.addSlowDiskReport(dnID, slowDiskReport);
}
+ private SlowDiskReports generateSlowDiskReport(String disk,
+ Map<DiskOp, Double> latencies) {
+ Map<String, Map<DiskOp, Double>> slowDisk = Maps.newHashMap();
+ slowDisk.put(disk, latencies);
+ SlowDiskReports slowDiskReport = SlowDiskReports.create(slowDisk);
+ return slowDiskReport;
+ }
+
Map<String, DiskLatency> getSlowDisksReportForTesting(
SlowDiskTracker slowDiskTracker) {
Map<String, DiskLatency> slowDisksMap = Maps.newHashMap();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org