Repository: hadoop Updated Branches: refs/heads/HDFS-12943 292ccdce8 -> 831097335
HDFS-13673. TestNameNodeMetrics fails on Windows. Contributed by Zuoming Zhang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/43d994e4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/43d994e4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/43d994e4 Branch: refs/heads/HDFS-12943 Commit: 43d994e4a6dfd1c24eafb909d6f8a0663b20769a Parents: b272b71 Author: Inigo Goiri <[email protected]> Authored: Fri Jun 15 10:33:28 2018 -0700 Committer: Inigo Goiri <[email protected]> Committed: Fri Jun 15 10:33:28 2018 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/43d994e4/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java index e34deea..05cf2ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java @@ -71,6 +71,7 @@ import org.apache.hadoop.hdfs.protocol.SystemErasureCodingPolicies; 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; @@ -271,7 +272,8 @@ public class TestNameNodeMetrics { File dataDir = new File(fsVolume.getBaseURI()); 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); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
