hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From inigo...@apache.org
Subject [1/5] hadoop git commit: HDFS-13673. TestNameNodeMetrics fails on Windows. Contributed by Zuoming Zhang.
Date Fri, 15 Jun 2018 17:36:11 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 fcd7ae274 -> 55b50eecc
  refs/heads/branch-2.9 e75032362 -> 58ec0b5b7
  refs/heads/branch-3.0 a3c0c0389 -> 94e0b9839
  refs/heads/branch-3.1 fd7cd596b -> 4add4c1be
  refs/heads/trunk b272b7109 -> 43d994e4a


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/trunk
Commit: 43d994e4a6dfd1c24eafb909d6f8a0663b20769a
Parents: b272b71
Author: Inigo Goiri <inigoiri@apache.org>
Authored: Fri Jun 15 10:33:28 2018 -0700
Committer: Inigo Goiri <inigoiri@apache.org>
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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message