Author: wheat9
Date: Thu Mar 6 08:16:12 2014
New Revision: 1574794
URL: http://svn.apache.org/r1574794
Log:
Merge r1574792 from trunk.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1574794&r1=1574793&r2=1574794&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Thu Mar 6 08:16:12 2014
@@ -306,6 +306,9 @@ Release 2.4.0 - UNRELEASED
HDFS-6057. DomainSocketWatcher.watcherThread should be marked as daemon
thread (cmccabe)
+ HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change.
+ (Akira Ajisaka via wheat9)
+
BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java?rev=1574794&r1=1574793&r2=1574794&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSShell.java
Thu Mar 6 08:16:12 2014
@@ -184,10 +184,7 @@ public class TestDFSShell {
public void testDu() throws IOException {
Configuration conf = new HdfsConfiguration();
MiniDFSCluster cluster = new
MiniDFSCluster.Builder(conf).numDataNodes(2).build();
- FileSystem fs = cluster.getFileSystem();
- assertTrue("Not a HDFS: "+fs.getUri(),
- fs instanceof DistributedFileSystem);
- final DistributedFileSystem dfs = (DistributedFileSystem)fs;
+ DistributedFileSystem fs = cluster.getFileSystem();
PrintStream psBackup = System.out;
ByteArrayOutputStream out = new ByteArrayOutputStream();
PrintStream psOut = new PrintStream(out);
@@ -224,7 +221,6 @@ public class TestDFSShell {
assertTrue(returnString.contains("23"));
} finally {
- try {dfs.close();} catch (Exception e) {}
System.setOut(psBackup);
cluster.shutdown();
}
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml?rev=1574794&r1=1574793&r2=1574794&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testAclCLI.xml
Thu Mar 6 08:16:12 2014
@@ -902,10 +902,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^drwxr-xr-x\+( )*-( )*[a-zA-z0-9]*( )*supergroup(
)*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/dir2</expected-output>
</comparator>
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1574794&r1=1574793&r2=1574794&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Thu Mar 6 08:16:12 2014
@@ -42,10 +42,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file1</expected-output>
</comparator>
@@ -64,10 +60,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output>
</comparator>
@@ -118,10 +110,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/dir1</expected-output>
</comparator>
@@ -139,10 +127,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^drwxr-xr-x( )*-( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*dir1</expected-output>
</comparator>
@@ -222,10 +206,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file1</expected-output>
</comparator>
@@ -243,10 +223,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file1</expected-output>
</comparator>
@@ -455,10 +431,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/a path with/whitespaces
in directories/and file names</expected-output>
</comparator>
@@ -477,10 +449,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*a path with/whitespaces
in directories/and file names</expected-output>
</comparator>
@@ -499,10 +467,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*NAMENODE/a path
with/whitespaces in directories/and file names</expected-output>
</comparator>
@@ -1727,10 +1691,6 @@
</cleanup-commands>:
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file2</expected-output>
</comparator>
@@ -1888,10 +1848,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file2</expected-output>
</comparator>
@@ -1914,10 +1870,6 @@
</cleanup-commands>:
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file2</expected-output>
</comparator>
@@ -2067,10 +2019,6 @@
</cleanup-commands>:
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file2</expected-output>
</comparator>
@@ -8720,10 +8668,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rwxrwxrwx( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file1</expected-output>
</comparator>
@@ -8743,10 +8687,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-rw-rw-( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output>
</comparator>
@@ -8833,10 +8773,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-rw-rw-( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file1</expected-output>
</comparator>
@@ -8855,10 +8791,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-rw-rw-( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output>
</comparator>
@@ -10357,10 +10289,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rwxrwxrwx( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file1</expected-output>
</comparator>
@@ -10413,10 +10341,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-rw-rw-( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file1</expected-output>
</comparator>
@@ -11176,10 +11100,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rwxrwxrwx( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file1</expected-output>
</comparator>
@@ -11232,10 +11152,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-rw-rw-( )*1( )*USERNAME( )*supergroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file1</expected-output>
</comparator>
@@ -11995,10 +11911,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*newowner( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file1</expected-output>
</comparator>
@@ -12422,10 +12334,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*newowner( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file1</expected-output>
</comparator>
@@ -12444,10 +12352,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*newowner( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output>
</comparator>
@@ -13274,10 +13178,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*newowner( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file1</expected-output>
</comparator>
@@ -13701,10 +13601,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*/file1</expected-output>
</comparator>
@@ -13723,10 +13619,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output>
</comparator>
@@ -14519,10 +14411,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*hdfs:///file1</expected-output>
</comparator>
@@ -14929,10 +14817,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^-rw-r--r--( )*1( )*USERNAME( )*newgroup( )*0(
)*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*NAMENODE/file1</expected-output>
</comparator>
