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 2018/06/15 17:36:12 UTC
[2/5] hadoop git commit: HDFS-13673. TestNameNodeMetrics fails on
Windows. Contributed by Zuoming Zhang.
HDFS-13673. TestNameNodeMetrics fails on Windows. Contributed by Zuoming Zhang.
(cherry picked from commit 43d994e4a6dfd1c24eafb909d6f8a0663b20769a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4add4c1b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4add4c1b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4add4c1b
Branch: refs/heads/branch-3.1
Commit: 4add4c1be0526d9779c521b62a75ceb3ac34dcc8
Parents: fd7cd59
Author: Inigo Goiri <in...@apache.org>
Authored: Fri Jun 15 10:33:28 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Fri Jun 15 10:34:08 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/4add4c1b/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