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 2018/05/17 16:24:00 UTC
[4/5] hadoop git commit: HDFS-13570. TestQuotaByStorageType, TestQuota,
TestDFSOutputStream fail on Windows. Contributed by Anbang Hu.
HDFS-13570. TestQuotaByStorageType,TestQuota,TestDFSOutputStream fail on Windows. Contributed by Anbang Hu.
(cherry picked from commit c0ec061e280c0d3e5299c0735c8b8697e0f31216)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/33dfbed8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/33dfbed8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/33dfbed8
Branch: refs/heads/branch-2
Commit: 33dfbed8d2fe5b63dcac1465967507f443e76cd3
Parents: 033b25c
Author: Inigo Goiri <in...@apache.org>
Authored: Thu May 17 09:21:57 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Thu May 17 09:23:11 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/TestDFSOutputStream.java | 2 +-
.../java/org/apache/hadoop/hdfs/TestQuota.java | 48 +++++++++++---------
.../server/namenode/TestQuotaByStorageType.java | 11 ++---
3 files changed, 30 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33dfbed8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
index f281a3b..1afa452 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
@@ -212,7 +212,7 @@ public class TestDFSOutputStream {
dfsCluster.waitActive();
final FSDataOutputStream os = dfsCluster.getFileSystem()
- .create(new Path(baseDir.getAbsolutePath(), "testPreventOverflow"));
+ .create(new Path(baseDir.getPath(), "testPreventOverflow"));
final DFSOutputStream dos = (DFSOutputStream) Whitebox
.getInternalState(os, "wrappedStream");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33dfbed8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java
index 48092c7..bf044e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestQuota.java
@@ -188,7 +188,7 @@ public class TestQuota {
public void testQuotaCommands() throws Exception {
DFSAdmin admin = new DFSAdmin(conf);
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
@@ -469,7 +469,7 @@ public class TestQuota {
@Test
public void testNamespaceCommands() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -650,7 +650,7 @@ public class TestQuota {
@Test
public void testSpaceCommands() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -907,7 +907,7 @@ public class TestQuota {
@Test
public void testQuotaByStorageType() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -952,7 +952,7 @@ public class TestQuota {
@Test
public void testMaxSpaceQuotas() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -1015,7 +1015,7 @@ public class TestQuota {
public void testBlockAllocationAdjustsUsageConservatively()
throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -1065,7 +1065,7 @@ public class TestQuota {
@Test
public void testMultipleFilesSmallerThanOneBlock() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -1167,7 +1167,7 @@ public class TestQuota {
@Test
public void testHugeFileCount() throws IOException {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(parent));
@@ -1200,7 +1200,7 @@ public class TestQuota {
final DFSAdmin dfsAdmin = new DFSAdmin(conf);
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
@@ -1231,7 +1231,7 @@ public class TestQuota {
public void testSetAndClearSpaceQuotaRegular() throws Exception {
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
@@ -1303,7 +1303,7 @@ public class TestQuota {
public void testSetAndClearSpaceQuotaByStorageType() throws Exception {
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
@@ -1356,27 +1356,27 @@ public class TestQuota {
* Test to set and clear space quote when directory doesn't exist.
*/
@Test(timeout = 30000)
- public void testSetAndClearSpaceQuotaDirecotryNotExist() throws Exception {
+ public void testSetAndClearSpaceQuotaDirectoryNotExist() throws Exception {
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
/* set space quota */
- testSetAndClearSpaceQuotaDirecotryNotExistInternal(
+ testSetAndClearSpaceQuotaDirectoryNotExistInternal(
new String[] {"-setSpaceQuota", "1024", dir.toString()},
dir,
-1,
"setSpaceQuota");
/* clear space quota */
- testSetAndClearSpaceQuotaDirecotryNotExistInternal(
+ testSetAndClearSpaceQuotaDirectoryNotExistInternal(
new String[] {"-clrSpaceQuota", dir.toString()},
dir,
-1,
"clrSpaceQuota");
}
- private void testSetAndClearSpaceQuotaDirecotryNotExistInternal(
+ private void testSetAndClearSpaceQuotaDirectoryNotExistInternal(
final String[] args,
final Path dir,
final int cmdRet,
@@ -1406,7 +1406,7 @@ public class TestQuota {
public void testSetAndClearSpaceQuotaPathIsFile() throws Exception {
final Path parent = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
final Path file = new Path(parent, "path-is-file");
DFSTestUtil.createFile(dfs, file, 1024L, (short) 1L, 0);
@@ -1457,7 +1457,7 @@ public class TestQuota {
public void testSetAndClearSpaceQuotaNoAccess() throws Exception {
final Path dir = new Path(
- PathUtils.getTestPath(getClass()),
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
@@ -1479,7 +1479,8 @@ public class TestQuota {
GenericTestUtils.setLogLevel(DFSOutputStream.LOG, Level.TRACE);
GenericTestUtils.setLogLevel(DataStreamer.LOG, Level.TRACE);
final DFSAdmin dfsAdmin = new DFSAdmin(conf);
- final Path dir = new Path(PathUtils.getTestPath(getClass()),
+ final Path dir = new Path(
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
final String[] args = new String[] {"-setSpaceQuota", "1", dir.toString()};
@@ -1503,7 +1504,8 @@ public class TestQuota {
GenericTestUtils.setLogLevel(DataStreamer.LOG, Level.TRACE);
GenericTestUtils.setLogLevel(DFSClient.LOG, Level.TRACE);
final DFSAdmin dfsAdmin = new DFSAdmin(conf);
- final Path dir = new Path(PathUtils.getTestPath(getClass()),
+ final Path dir = new Path(
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(dir));
final String[] args = new String[] {"-setSpaceQuota", "1", dir.toString()};
@@ -1543,7 +1545,8 @@ public class TestQuota {
GenericTestUtils.setLogLevel(DFSOutputStream.LOG, Level.TRACE);
GenericTestUtils.setLogLevel(DataStreamer.LOG, Level.TRACE);
final DFSAdmin dfsAdmin = new DFSAdmin(conf);
- final Path dir = new Path(PathUtils.getTestPath(getClass()),
+ final Path dir = new Path(
+ PathUtils.getTestDir(getClass()).getPath(),
GenericTestUtils.getMethodName());
dfs.delete(dir, true);
assertTrue(dfs.mkdirs(dir));
@@ -1600,7 +1603,8 @@ public class TestQuota {
private static void scanIntoList(
final ByteArrayOutputStream baos,
final List<String> list) {
- final Scanner scanner = new Scanner(baos.toString());
+ final Scanner scanner = new Scanner(
+ baos.toString().replaceAll("\r\r\n", System.lineSeparator()));
while (scanner.hasNextLine()) {
list.add(scanner.nextLine());
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/33dfbed8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaByStorageType.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaByStorageType.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaByStorageType.java
index be24e01..c0757e6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaByStorageType.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestQuotaByStorageType.java
@@ -36,7 +36,6 @@ import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.QuotaByStorageTypeExceededException;
import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotTestHelper;
import org.apache.hadoop.test.GenericTestUtils;
-import org.apache.hadoop.test.PathUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -804,8 +803,7 @@ public class TestQuotaByStorageType {
*/
@Test
public void testStorageSpaceQuotaWithWarmPolicy() throws IOException {
- final Path testDir = new Path(
- PathUtils.getTestPath(getClass()),
+ final Path testDir = new Path(dir,
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(testDir));
@@ -864,9 +862,7 @@ public class TestQuotaByStorageType {
*/
@Test(timeout = 30000)
public void testStorageSpaceQuotaWithRepFactor() throws IOException {
-
- final Path testDir = new Path(
- PathUtils.getTestPath(getClass()),
+ final Path testDir = new Path(dir,
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(testDir));
@@ -911,8 +907,7 @@ public class TestQuotaByStorageType {
*/
@Test(timeout = 30000)
public void testStorageSpaceQuotaPerQuotaClear() throws IOException {
- final Path testDir = new Path(
- PathUtils.getTestPath(getClass()),
+ final Path testDir = new Path(dir,
GenericTestUtils.getMethodName());
assertTrue(dfs.mkdirs(testDir));
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org