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/05/15 22:38:30 UTC
[2/5] hadoop git commit: HDFS-13567.
TestNameNodeMetrics#testGenerateEDEKTime,
TestNameNodeMetrics#testResourceCheck should use a different cluster basedir.
Contributed by Anbang Hu.
HDFS-13567. TestNameNodeMetrics#testGenerateEDEKTime,TestNameNodeMetrics#testResourceCheck should use a different cluster basedir. Contributed by Anbang Hu.
(cherry picked from commit 63480976a008bab0b84f4da08b1099867e5a9a6b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/899a7ec2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/899a7ec2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/899a7ec2
Branch: refs/heads/branch-3.1
Commit: 899a7ec2fbc8e1ee3579db88041e86f7d8dce1d4
Parents: 34fbc1c
Author: Inigo Goiri <in...@apache.org>
Authored: Tue May 15 15:34:54 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue May 15 15:36:03 2018 -0700
----------------------------------------------------------------------
.../hdfs/server/namenode/metrics/TestNameNodeMetrics.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/899a7ec2/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 db9adbe..92bc51c 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
@@ -992,8 +992,10 @@ public class TestNameNodeMetrics {
.DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY, true);
conf.setInt(DFSConfigKeys.DFS_NAMENODE_LIST_ENCRYPTION_ZONES_NUM_RESPONSES,
2);
+ File basedir = new File(MiniDFSCluster.getBaseDirectory(),
+ GenericTestUtils.getMethodName());
- try (MiniDFSCluster clusterEDEK = new MiniDFSCluster.Builder(conf)
+ try (MiniDFSCluster clusterEDEK = new MiniDFSCluster.Builder(conf, basedir)
.numDataNodes(1).build()) {
DistributedFileSystem fsEDEK =
@@ -1029,7 +1031,9 @@ public class TestNameNodeMetrics {
@Test
public void testResourceCheck() throws Exception {
HdfsConfiguration conf = new HdfsConfiguration();
- MiniDFSCluster tmpCluster = new MiniDFSCluster.Builder(conf)
+ File basedir = new File(MiniDFSCluster.getBaseDirectory(),
+ GenericTestUtils.getMethodName());
+ MiniDFSCluster tmpCluster = new MiniDFSCluster.Builder(conf, basedir)
.numDataNodes(0)
.nnTopology(MiniDFSNNTopology.simpleHATopology())
.build();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org