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.

This commit is contained in:
Akira Ajisaka 2017-06-15 13:49:47 +09:00
parent 11e6c96788
commit 59fab4ea04
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -352,6 +352,9 @@ Release 2.7.4 - UNRELEASED
HDFS-11743. Revert the incompatible fsck reporting output in HDFS-7933
from branch-2.7. (zhz)
HDFS-11736. OIV tests should not write outside 'target' directory.
(Yiqun Lin via aajisaka)
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES

6
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.Random;
import com.google.common.io.Files;
import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -2434,7 +2433,10 @@ public class TestCheckpoint {
public void testLegacyOivImage() throws Exception {
MiniDFSCluster cluster = null;
SecondaryNameNode secondary = null;
File tmpDir = Files.createTempDir();
File tmpDir = new File(MiniDFSCluster.getBaseDirectory(),
"testLegacyOivImage");
tmpDir.mkdirs();
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_NAMENODE_LEGACY_OIV_IMAGE_DIR_KEY,
tmpDir.getAbsolutePath());

9
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.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.io.Files;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@ -114,7 +113,9 @@ public class TestStandbyCheckpoints {
}
protected Configuration setupCommonConfig() {
tmpOivImgDir = Files.createTempDir();
tmpOivImgDir = new File(MiniDFSCluster.getBaseDirectory(),
"TestStandbyCheckpoints");
tmpOivImgDir.mkdirs();
Configuration conf = new Configuration();
conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_CHECK_PERIOD_KEY, 1);
@ -135,6 +136,10 @@ public class TestStandbyCheckpoints {
if (cluster != null) {
cluster.shutdown();
}
if (tmpOivImgDir != null) {
FileUtil.fullyDelete(tmpOivImgDir);
}
}
@Test(timeout = 300000)