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 2017/06/21 23:23:51 UTC
[04/50] [abbrv] hadoop git commit: HDFS-11736. OIV tests should not
write outside 'target' directory. Contributed by Yiqun Lin.
HDFS-11736. OIV tests should not write outside 'target' directory. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/315f0770
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/315f0770
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/315f0770
Branch: refs/heads/HDFS-10467
Commit: 315f07700dcfe32513b87f63070db854ecb3cf48
Parents: 999c8fc
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jun 15 13:46:20 2017 +0900
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jun 15 13:46:20 2017 +0900
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/namenode/TestCheckpoint.java | 4 ++--
.../hdfs/server/namenode/ha/TestStandbyCheckpoints.java | 8 ++++++--
.../tools/offlineImageViewer/TestOfflineImageViewer.java | 7 ++++---
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/315f0770/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
index 8b48225..2e49674 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
@@ -44,7 +44,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.google.common.io.Files;
import org.apache.commons.cli.ParseException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -2436,7 +2435,8 @@ public class TestCheckpoint {
public void testLegacyOivImage() throws Exception {
MiniDFSCluster cluster = null;
SecondaryNameNode secondary = null;
- File tmpDir = Files.createTempDir();
+ File tmpDir = GenericTestUtils.getTestDir("testLegacyOivImage");
+ tmpDir.mkdirs();
Configuration conf = new HdfsConfiguration();
conf.set(DFSConfigKeys.DFS_NAMENODE_LEGACY_OIV_IMAGE_DIR_KEY,
tmpDir.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/hadoop/blob/315f0770/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
index 2af373f..4849b54 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestStandbyCheckpoints.java
@@ -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;
@@ -122,7 +121,8 @@ public class TestStandbyCheckpoints {
}
protected Configuration setupCommonConfig() {
- tmpOivImgDir = Files.createTempDir();
+ tmpOivImgDir = GenericTestUtils.getTestDir("TestStandbyCheckpoints");
+ tmpOivImgDir.mkdirs();
Configuration conf = new Configuration();
conf.setInt(DFSConfigKeys.DFS_NAMENODE_CHECKPOINT_CHECK_PERIOD_KEY, 1);
@@ -144,6 +144,10 @@ public class TestStandbyCheckpoints {
cluster.shutdown();
cluster = null;
}
+
+ if (tmpOivImgDir != null) {
+ FileUtil.fullyDelete(tmpOivImgDir);
+ }
}
@Test(timeout = 300000)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/315f0770/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
index 7182071..46f1941 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
@@ -57,8 +57,6 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import com.google.common.io.Files;
-
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.NullOutputStream;
import org.apache.commons.logging.Log;
@@ -120,7 +118,10 @@ public class TestOfflineImageViewer {
// multiple tests.
@BeforeClass
public static void createOriginalFSImage() throws IOException {
- tempDir = Files.createTempDir();
+ File[] nnDirs = MiniDFSCluster.getNameNodeDirectory(
+ MiniDFSCluster.getBaseDirectory(), 0, 0);
+ tempDir = nnDirs[0];
+
MiniDFSCluster cluster = null;
try {
final ErasureCodingPolicy ecPolicy = SystemErasureCodingPolicies
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org