Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-13567. TestNameNodeMetrics#testGenerateEDEKTime,TestNameNodeMetrics#testResourceCheck should use a different cluster basedir. Contributed by Anbang Hu. 

(cherry picked from commit 63480976a0)
This commit is contained in:
Inigo Goiri 2018-05-15 15:34:54 -07:00
parent 34fbc1c2eb
commit 899a7ec2fb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
View File

@ -992,8 +992,10 @@ public class TestNameNodeMetrics {
.DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY, true); .DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY, true);
conf.setInt(DFSConfigKeys.DFS_NAMENODE_LIST_ENCRYPTION_ZONES_NUM_RESPONSES, conf.setInt(DFSConfigKeys.DFS_NAMENODE_LIST_ENCRYPTION_ZONES_NUM_RESPONSES,
2); 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()) { .numDataNodes(1).build()) {
DistributedFileSystem fsEDEK = DistributedFileSystem fsEDEK =
@ -1029,7 +1031,9 @@ public class TestNameNodeMetrics {
@Test @Test
public void testResourceCheck() throws Exception { public void testResourceCheck() throws Exception {
HdfsConfiguration conf = new HdfsConfiguration(); 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) .numDataNodes(0)
.nnTopology(MiniDFSNNTopology.simpleHATopology()) .nnTopology(MiniDFSNNTopology.simpleHATopology())
.build(); .build();