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 ww...@apache.org on 2017/07/26 09:55:23 UTC
hadoop git commit: HDFS-12192. Ozone: Fix the remaining failure tests
for Windows caused by incorrect path generated. Contributed by Yiqun Lin.
Repository: hadoop
Updated Branches:
refs/heads/HDFS-7240 5d0f54514 -> 04b39066d
HDFS-12192. Ozone: Fix the remaining failure tests for Windows caused by incorrect path generated. 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/04b39066
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04b39066
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04b39066
Branch: refs/heads/HDFS-7240
Commit: 04b39066db5226d64c5a70724779e815236e6f2e
Parents: 5d0f545
Author: Weiwei Yang <ww...@apache.org>
Authored: Wed Jul 26 17:51:05 2017 +0800
Committer: Weiwei Yang <ww...@apache.org>
Committed: Wed Jul 26 17:51:05 2017 +0800
----------------------------------------------------------------------
.../apache/hadoop/cblock/TestBufferManager.java | 41 ++++++++++----------
.../hadoop/cblock/TestCBlockReadWrite.java | 15 +++----
.../hadoop/cblock/TestLocalBlockCache.java | 7 +---
.../common/TestDatanodeStateMachine.java | 6 +--
4 files changed, 30 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04b39066/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
index e38ca71..73c8696 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestBufferManager.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.cblock.jscsiHelper.cache.impl.CBlockLocalCache;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfiguration;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.scm.XceiverClientManager;
import org.apache.hadoop.scm.XceiverClientSpi;
import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -37,9 +36,7 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
-import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.TimeoutException;
@@ -69,9 +66,8 @@ public class TestBufferManager {
@BeforeClass
public static void init() throws IOException {
config = new OzoneConfiguration();
- File p = GenericTestUtils.getTestDir();
- String path = p.getPath().concat(
- TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils.getTempPath(
+ TestBufferManager.class.getSimpleName());
config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -129,11 +125,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException {
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(
- TestOzoneContainer.class.getSimpleName() +
- GenericTestUtils.getMethodName() +
- RandomStringUtils.randomNumeric(4));
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -214,8 +208,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException{
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -258,8 +253,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException {
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -306,8 +302,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException {
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -354,8 +351,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException{
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -400,8 +398,9 @@ public class TestBufferManager {
InterruptedException, TimeoutException{
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestBufferManager.class.getSimpleName()
+ + RandomStringUtils.randomNumeric(4));
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04b39066/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
index 94fe4cb..811901f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestCBlockReadWrite.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.scm.XceiverClientManager;
import org.apache.hadoop.scm.XceiverClientSpi;
import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -42,7 +41,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.io.IOException;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.LinkedList;
import java.util.List;
@@ -74,9 +72,8 @@ public class TestCBlockReadWrite {
@BeforeClass
public static void init() throws IOException {
config = new OzoneConfiguration();
- URL p = config.getClass().getResource("");
- String path = p.getPath().concat(
- TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestCBlockReadWrite.class.getSimpleName());
config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -193,8 +190,8 @@ public class TestCBlockReadWrite {
InterruptedException, TimeoutException {
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestCBlockReadWrite.class.getSimpleName());
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
@@ -282,8 +279,8 @@ public class TestCBlockReadWrite {
InterruptedException, TimeoutException {
// Create a new config so that this tests write metafile to new location
OzoneConfiguration flushTestConfig = new OzoneConfiguration();
- URL p = flushTestConfig.getClass().getResource("");
- String path = p.getPath().concat(TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestCBlockReadWrite.class.getSimpleName());
flushTestConfig.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
flushTestConfig.setBoolean(DFS_CBLOCK_TRACE_IO, true);
flushTestConfig.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04b39066/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
index eec417a..7514715 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cblock/TestLocalBlockCache.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.ozone.MiniOzoneCluster;
import org.apache.hadoop.ozone.OzoneConfiguration;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer;
import org.apache.hadoop.scm.XceiverClientManager;
import org.apache.hadoop.scm.XceiverClientSpi;
import org.apache.hadoop.scm.container.common.helpers.Pipeline;
@@ -45,7 +44,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedList;
@@ -80,9 +78,8 @@ public class TestLocalBlockCache {
@BeforeClass
public static void init() throws IOException {
config = new OzoneConfiguration();
- URL p = config.getClass().getResource("");
- String path = p.getPath().concat(
- TestOzoneContainer.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestLocalBlockCache.class.getSimpleName());
config.set(DFS_CBLOCK_DISK_CACHE_PATH_KEY, path);
config.setBoolean(DFS_CBLOCK_TRACE_IO, true);
config.setBoolean(DFS_CBLOCK_ENABLE_SHORT_CIRCUIT_IO, true);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04b39066/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
index 15b2852..2ffdba7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
@@ -44,7 +44,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.net.URL;
import java.nio.file.Paths;
import java.util.LinkedList;
import java.util.List;
@@ -94,9 +93,8 @@ public class TestDatanodeStateMachine {
conf.setStrings(ScmConfigKeys.OZONE_SCM_NAMES,
serverAddresses.toArray(new String[0]));
- URL p = this.getClass().getResource("");
- String path = p.getPath().concat(
- TestDatanodeStateMachine.class.getSimpleName());
+ String path = GenericTestUtils
+ .getTempPath(TestDatanodeStateMachine.class.getSimpleName());
testRoot = new File(path);
if (!testRoot.mkdirs()) {
LOG.info("Required directories already exist.");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org