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

HDFS-11736. OIV tests should not write outside 'target' directory. Contributed by Yiqun Lin. 

(cherry picked from commit 315f07700d)
(cherry picked from commit 88fa17c238)
This commit is contained in:
Akira Ajisaka 2017-06-15 13:46:20 +09:00
parent 6ca195997b
commit a52315d2c3
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
View File

@ -44,7 +44,6 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import com.google.common.io.Files;
import org.apache.commons.cli.ParseException; import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@ -2438,7 +2437,8 @@ public class TestCheckpoint {
public void testLegacyOivImage() throws Exception { public void testLegacyOivImage() throws Exception {
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
SecondaryNameNode secondary = null; SecondaryNameNode secondary = null;
File tmpDir = Files.createTempDir(); File tmpDir = GenericTestUtils.getTestDir("testLegacyOivImage");
tmpDir.mkdirs();
Configuration conf = new HdfsConfiguration(); Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_NAMENODE_LEGACY_OIV_IMAGE_DIR_KEY, conf.set(DFSConfigKeys.DFS_NAMENODE_LEGACY_OIV_IMAGE_DIR_KEY,
tmpDir.getAbsolutePath()); tmpDir.getAbsolutePath());

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

@ -21,7 +21,6 @@ import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.io.Files;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -114,7 +113,8 @@ public class TestStandbyCheckpoints {
} }
protected Configuration setupCommonConfig() { protected Configuration setupCommonConfig() {
tmpOivImgDir = Files.createTempDir(); tmpOivImgDir = GenericTestUtils.getTestDir("TestStandbyCheckpoints");
tmpOivImgDir.mkdirs();
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_CHECK_PERIOD_KEY, 1); conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_CHECK_PERIOD_KEY, 1);
@ -136,6 +136,10 @@ public class TestStandbyCheckpoints {
cluster.shutdown(); cluster.shutdown();
cluster = null; cluster = null;
} }
if (tmpOivImgDir != null) {
FileUtil.fullyDelete(tmpOivImgDir);
}
} }
@Test(timeout = 300000) @Test(timeout = 300000)

7
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
View File

@ -56,8 +56,6 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory; import javax.xml.parsers.SAXParserFactory;
import com.google.common.io.Files;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -116,7 +114,10 @@ public class TestOfflineImageViewer {
// multiple tests. // multiple tests.
@BeforeClass @BeforeClass
public static void createOriginalFSImage() throws IOException { public static void createOriginalFSImage() throws IOException {
tempDir = Files.createTempDir(); File[] nnDirs = MiniDFSCluster.getNameNodeDirectory(
MiniDFSCluster.getBaseDirectory(), 0, 0);
tempDir = nnDirs[0];
MiniDFSCluster cluster = null; MiniDFSCluster cluster = null;
try { try {
Configuration conf = new Configuration(); Configuration conf = new Configuration();