HDFS-13673. TestNameNodeMetrics fails on Windows. Contributed by Zuom…

…ing Zhang. (cherry picked from commit 43d994e)
justinuang · Jun 15, 2018 · 58ec0b5 · 58ec0b5
1 parent e750323
commit 58ec0b5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...dfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java b/...dfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
@@ -65,6 +65,7 @@
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockManager;
 import org.apache.hadoop.hdfs.server.blockmanagement.BlockManagerTestUtil;
 import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor;
+import org.apache.hadoop.hdfs.server.common.Storage;
 import org.apache.hadoop.hdfs.server.datanode.DataNode;
 import org.apache.hadoop.hdfs.server.datanode.DataNodeTestUtils;
 import org.apache.hadoop.hdfs.server.datanode.fsdataset.FsDatasetSpi;
@@ -258,7 +259,8 @@ public void testVolumeFailures() throws Exception {
     File dataDir = new File(fsVolume.getBasePath());
     long capacity = fsVolume.getCapacity();
     volumeReferences.close();
-    DataNodeTestUtils.injectDataDirFailure(dataDir);
+    File storageDir = new File(dataDir, Storage.STORAGE_DIR_CURRENT);
+    DataNodeTestUtils.injectDataDirFailure(storageDir);
     DataNodeTestUtils.waitForDiskError(dn, fsVolume);
     DataNodeTestUtils.triggerHeartbeat(dn);
     BlockManagerTestUtil.checkHeartbeat(bm);