From 5b2427cd732e84eac23f5dff8ca39313396cab2e Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Mon, 23 Apr 2018 19:12:16 -0700 Subject: [PATCH] HDFS-13336. Test cases of TestWriteToReplica failed in windows. Contributed by Xiao Liang. (cherry picked from commit df92a17e02fe86279a6f4e413719d0a465b50837) --- .../fsdataset/impl/TestWriteToReplica.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java index 14ac95f76cf..2c5df28e5c3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/TestWriteToReplica.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; +import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import java.util.ArrayList; @@ -64,7 +65,8 @@ public class TestWriteToReplica { // test close @Test public void testClose() throws Exception { - MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()).build(); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration(), + new File(GenericTestUtils.getRandomizedTempPath())).build(); try { cluster.waitActive(); @@ -86,7 +88,8 @@ public class TestWriteToReplica { // test append @Test public void testAppend() throws Exception { - MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()).build(); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration(), + new File(GenericTestUtils.getRandomizedTempPath())).build(); try { cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); @@ -106,7 +109,8 @@ public class TestWriteToReplica { // test writeToRbw @Test public void testWriteToRbw() throws Exception { - MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()).build(); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration(), + new File(GenericTestUtils.getRandomizedTempPath())).build(); try { cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); @@ -126,7 +130,8 @@ public class TestWriteToReplica { // test writeToTemporary @Test public void testWriteToTemporary() throws Exception { - MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()).build(); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration(), + new File(GenericTestUtils.getRandomizedTempPath())).build(); try { cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); @@ -512,7 +517,8 @@ public class TestWriteToReplica { @Test public void testReplicaMapAfterDatanodeRestart() throws Exception { Configuration conf = new HdfsConfiguration(); - MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf) + MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf, + new File(GenericTestUtils.getRandomizedTempPath())) .nnTopology(MiniDFSNNTopology.simpleFederatedTopology(2)) .build(); try { @@ -566,7 +572,8 @@ public class TestWriteToReplica { @Test public void testRecoverInconsistentRbw() throws IOException { Configuration conf = new HdfsConfiguration(); - MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build(); + MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf, + new File(GenericTestUtils.getRandomizedTempPath())).build(); cluster.waitActive(); DataNode dn = cluster.getDataNodes().get(0); FsDatasetImpl fsDataset = (FsDatasetImpl)DataNodeTestUtils.getFSDataset(dn);