date:20120731

svn commit: r1367766 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 20:44:56 2012
New Revision: 1367766

URL: http://svn.apache.org/viewvc?rev=1367766&view=rev
Log:
merge -r 1367764:1367765 from branch-2. FIXES: HADOOP-8370

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367766&r1=1367765&r2=1367766&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Tue Jul 31 20:44:56 2012
@@ -142,6 +142,10 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
 
+HADOOP-8370. Native build failure: javah: class file for 
+org.apache.hadoop.classification.InterfaceAudience not found  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml?rev=1367766&r1=1367765&r2=1367766&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml 
(original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/pom.xml 
Tue Jul 31 20:44:56 2012
@@ -43,7 +43,7 @@
 
   org.apache.hadoop
   hadoop-annotations
-  provided
+  compile
 
 
   com.google.guava

svn commit: r1367765 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 20:44:12 2012
New Revision: 1367765

URL: http://svn.apache.org/viewvc?rev=1367765&view=rev
Log:
merge -r 1367763:1367764 from trunk. FIXES: HADOOP-8370

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367765&r1=1367764&r2=1367765&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Tue Jul 31 20:44:12 2012
@@ -688,6 +688,10 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
 
+HADOOP-8370. Native build failure: javah: class file for 
+org.apache.hadoop.classification.InterfaceAudience not found  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml?rev=1367765&r1=1367764&r2=1367765&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/pom.xml 
Tue Jul 31 20:44:12 2012
@@ -43,7 +43,7 @@
 
   org.apache.hadoop
   hadoop-annotations
-  provided
+  compile
 
 
   com.google.guava

svn commit: r1367764 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 20:43:21 2012
New Revision: 1367764

URL: http://svn.apache.org/viewvc?rev=1367764&view=rev
Log:
HADOOP-8370. Native build failure: javah: class file for 
org.apache.hadoop.classification.InterfaceAudience not found  (Trevor Robinson 
via tgraves)

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367764&r1=1367763&r2=1367764&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jul 
31 20:43:21 2012
@@ -869,6 +869,10 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
 
+HADOOP-8370. Native build failure: javah: class file for 
+org.apache.hadoop.classification.InterfaceAudience not found  (Trevor
+Robinson via tgraves)
+
 Release 0.23.2 - UNRELEASED 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml?rev=1367764&r1=1367763&r2=1367764&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/pom.xml Tue Jul 31 
20:43:21 2012
@@ -44,7 +44,7 @@
 
   org.apache.hadoop
   hadoop-annotations
-  provided
+  compile
 
 
   com.google.guava

svn commit: r1367729 - /hadoop/common/branches/branch-2/hadoop-project/pom.xml

2012-07-31 Thread bobby

Author: bobby
Date: Tue Jul 31 19:50:11 2012
New Revision: 1367729

URL: http://svn.apache.org/viewvc?rev=1367729&view=rev
Log:
svn merge -c 1367726. FIXES: MAPREDUCE-4483. 2.0 build does not work (John 
George via bobby)

Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml

Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1367729&r1=1367728&r2=1367729&view=diff
==
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Tue Jul 31 19:50:11 
2012
@@ -200,6 +200,12 @@
 test-jar
   
 
+ 
+org.apache.hadoop
+hadoop-yarn-applications-distributedshell
+${project.version}
+  
+
   
 org.apache.hadoop
  hadoop-mapreduce-client-jobclient

svn commit: r1367726 - /hadoop/common/trunk/hadoop-project/pom.xml

2012-07-31 Thread bobby

Author: bobby
Date: Tue Jul 31 19:43:51 2012
New Revision: 1367726

URL: http://svn.apache.org/viewvc?rev=1367726&view=rev
Log:
MAPREDUCE-4483. 2.0 build does not work (John George via bobby)

Modified:
hadoop/common/trunk/hadoop-project/pom.xml

Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1367726&r1=1367725&r2=1367726&view=diff
==
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Tue Jul 31 19:43:51 2012
@@ -197,6 +197,12 @@
 test-jar
   
 
+ 
+org.apache.hadoop
+hadoop-yarn-applications-distributedshell
+${project.version}
+  
+
   
 org.apache.hadoop
  hadoop-mapreduce-client-jobclient

svn commit: r1367717 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:22:25 2012
New Revision: 1367717

URL: http://svn.apache.org/viewvc?rev=1367717&view=rev
Log:
merge -r 1367714:1367715 from branch-2. FIXES: MAPREDUCE-4493

Modified:

hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1367717&r1=1367716&r2=1367717&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 Tue Jul 31 19:22:25 2012
@@ -958,7 +958,6 @@ public class StreamJob implements Tool {
   if (!b)
 fail(LINK_URI);
 }
-DistributedCache.createSymlink(jobConf_);
 // set the jobconf for the caching parameters
 if (cacheArchives != null)
   DistributedCache.setCacheArchives(archiveURIs, jobConf_);

svn commit: r1367717 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:22:25 2012
New Revision: 1367717

URL: http://svn.apache.org/viewvc?rev=1367717&view=rev
Log:
merge -r 1367714:1367715 from branch-2. FIXES: MAPREDUCE-4493

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm?rev=1367717&r1=1367716&r2=1367717&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 Tue Jul 31 19:22:25 2012
@@ -198,7 +198,9 @@ Deprecated Properties
 *---+---+
 |mapred.compress.map.output | mapreduce.map.output.compress
 *---+---+
-|mapred.create.symlink | mapreduce.job.cache.symlink.create
+|mapred.create.symlink | NONE - symlinking is always on
+*---+---+
+|mapreduce.job.cache.symlink.create | NONE - symlinking is always on
 *---+---+
 |mapred.data.field.separator | mapreduce.fieldsel.data.field.separator
 *---+---+

svn commit: r1367715 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:21:27 2012
New Revision: 1367715

URL: http://svn.apache.org/viewvc?rev=1367715&view=rev
Log:
merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493

Modified:

hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

Modified: 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1367715&r1=1367714&r2=1367715&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 Tue Jul 31 19:21:27 2012
@@ -958,7 +958,6 @@ public class StreamJob implements Tool {
   if (!b)
 fail(LINK_URI);
 }
-DistributedCache.createSymlink(jobConf_);
 // set the jobconf for the caching parameters
 if (cacheArchives != null)
   DistributedCache.setCacheArchives(archiveURIs, jobConf_);

svn commit: r1367715 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:21:27 2012
New Revision: 1367715

URL: http://svn.apache.org/viewvc?rev=1367715&view=rev
Log:
merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm?rev=1367715&r1=1367714&r2=1367715&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 Tue Jul 31 19:21:27 2012
@@ -198,7 +198,9 @@ Deprecated Properties
 *---+---+
 |mapred.compress.map.output | mapreduce.map.output.compress
 *---+---+
-|mapred.create.symlink | mapreduce.job.cache.symlink.create
+|mapred.create.symlink | NONE - symlinking is always on
+*---+---+
+|mapreduce.job.cache.symlink.create | NONE - symlinking is always on
 *---+---+
 |mapred.data.field.separator | mapreduce.fieldsel.data.field.separator
 *---+---+

svn commit: r1367713 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:20:03 2012
New Revision: 1367713

URL: http://svn.apache.org/viewvc?rev=1367713&view=rev
Log:
MAPREDUCE-4493. Distibuted Cache Compatability Issues (Robert Evans via tgraves)

Modified:

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm?rev=1367713&r1=1367712&r2=1367713&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm
 Tue Jul 31 19:20:03 2012
@@ -196,7 +196,9 @@ Deprecated Properties
 *---+---+
 |mapred.compress.map.output | mapreduce.map.output.compress
 *---+---+
-|mapred.create.symlink | mapreduce.job.cache.symlink.create
+|mapred.create.symlink | NONE - symlinking is always on
+*---+---+
+|mapreduce.job.cache.symlink.create | NONE - symlinking is always on
 *---+---+
 |mapred.data.field.separator | mapreduce.fieldsel.data.field.separator
 *---+---+

svn commit: r1367713 - /hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

2012-07-31 Thread tgraves

Author: tgraves
Date: Tue Jul 31 19:20:03 2012
New Revision: 1367713

URL: http://svn.apache.org/viewvc?rev=1367713&view=rev
Log:
MAPREDUCE-4493. Distibuted Cache Compatability Issues (Robert Evans via tgraves)

Modified:

hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

Modified: 
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java?rev=1367713&r1=1367712&r2=1367713&view=diff
==
--- 
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 (original)
+++ 
hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java
 Tue Jul 31 19:20:03 2012
@@ -958,7 +958,6 @@ public class StreamJob implements Tool {
   if (!b)
 fail(LINK_URI);
 }
-DistributedCache.createSymlink(jobConf_);
 // set the jobconf for the caching parameters
 if (cacheArchives != null)
   DistributedCache.setCacheArchives(archiveURIs, jobConf_);

svn commit: r1367705 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/

2012-07-31 Thread bobby

Author: bobby
Date: Tue Jul 31 19:01:13 2012
New Revision: 1367705

URL: http://svn.apache.org/viewvc?rev=1367705&view=rev
Log:
svn merge -c 1367702 FIXES: HADOOP-8637. FilterFileSystem#setWriteChecksum is 
broken (daryn via bobby)

Modified:

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java

hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367705&r1=1367704&r2=1367705&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt
 Tue Jul 31 19:01:13 2012
@@ -140,6 +140,8 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8635. Cannot cancel paths registered deleteOnExit (daryn via bobby)
 
+HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java?rev=1367705&r1=1367704&r2=1367705&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 Tue Jul 31 19:01:13 2012
@@ -376,7 +376,7 @@ public class FilterFileSystem extends Fi
   
   @Override
   public void setWriteChecksum(boolean writeChecksum) {
-fs.setVerifyChecksum(writeChecksum);
+fs.setWriteChecksum(writeChecksum);
   }
 
   @Override

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java?rev=1367705&r1=1367704&r2=1367705&view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 Tue Jul 31 19:01:13 2012
@@ -269,6 +269,30 @@ public class TestFilterFileSystem {
 checkFsConf(flfs, conf, 3);
   }
 
+  @Test
+  public void testVerifyChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setVerifyChecksum(false);
+verify(mockFs).setVerifyChecksum(eq(false));
+reset(mockFs);
+fs.setVerifyChecksum(true);
+verify(mockFs).setVerifyChecksum(eq(true));
+  }
+
+  @Test
+  public void testWriteChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setWriteChecksum(false);
+verify(mockFs).setWriteChecksum(eq(false));
+reset(mockFs);
+fs.setWriteChecksum(true);
+verify(mockFs).setWriteChecksum(eq(true));
+  }
+
   private void checkInit(FilterFileSystem fs, boolean expectInit)
   throws Exception {
 URI uri = URI.create("filter:/");

svn commit: r1367703 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/fs/

2012-07-31 Thread bobby

Author: bobby
Date: Tue Jul 31 19:00:03 2012
New Revision: 1367703

URL: http://svn.apache.org/viewvc?rev=1367703&view=rev
Log:
svn merge -c 1367702 FIXES: HADOOP-8637. FilterFileSystem#setWriteChecksum is 
broken (daryn via bobby)

Modified:

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java

hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367703&r1=1367702&r2=1367703&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Tue Jul 31 19:00:03 2012
@@ -686,6 +686,8 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8635. Cannot cancel paths registered deleteOnExit (daryn via bobby)
 
+HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
+
 Release 0.23.2 - UNRELEASED 
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java?rev=1367703&r1=1367702&r2=1367703&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 Tue Jul 31 19:00:03 2012
@@ -376,7 +376,7 @@ public class FilterFileSystem extends Fi
   
   @Override
   public void setWriteChecksum(boolean writeChecksum) {
-fs.setVerifyChecksum(writeChecksum);
+fs.setWriteChecksum(writeChecksum);
   }
 
   @Override

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java?rev=1367703&r1=1367702&r2=1367703&view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 Tue Jul 31 19:00:03 2012
@@ -286,6 +286,30 @@ public class TestFilterFileSystem {
 checkFsConf(flfs, conf, 3);
   }
 
+  @Test
+  public void testVerifyChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setVerifyChecksum(false);
+verify(mockFs).setVerifyChecksum(eq(false));
+reset(mockFs);
+fs.setVerifyChecksum(true);
+verify(mockFs).setVerifyChecksum(eq(true));
+  }
+
+  @Test
+  public void testWriteChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setWriteChecksum(false);
+verify(mockFs).setWriteChecksum(eq(false));
+reset(mockFs);
+fs.setWriteChecksum(true);
+verify(mockFs).setWriteChecksum(eq(true));
+  }
+
   private void checkInit(FilterFileSystem fs, boolean expectInit)
   throws Exception {
 URI uri = URI.create("filter:/");

svn commit: r1367702 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/fs/TestFilterFi

2012-07-31 Thread bobby

Author: bobby
Date: Tue Jul 31 18:58:43 2012
New Revision: 1367702

URL: http://svn.apache.org/viewvc?rev=1367702&view=rev
Log:
HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)

Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java

Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1367702&r1=1367701&r2=1367702&view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Tue Jul 
31 18:58:43 2012
@@ -867,6 +867,8 @@ Release 0.23.3 - UNRELEASED
 
 HADOOP-8635. Cannot cancel paths registered deleteOnExit (daryn via bobby)
 
+HADOOP-8637. FilterFileSystem#setWriteChecksum is broken (daryn via bobby)
+
 Release 0.23.2 - UNRELEASED 
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java?rev=1367702&r1=1367701&r2=1367702&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
 Tue Jul 31 18:58:43 2012
@@ -376,7 +376,7 @@ public class FilterFileSystem extends Fi
   
   @Override
   public void setWriteChecksum(boolean writeChecksum) {
-fs.setVerifyChecksum(writeChecksum);
+fs.setWriteChecksum(writeChecksum);
   }
 
   @Override

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java?rev=1367702&r1=1367701&r2=1367702&view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
 Tue Jul 31 18:58:43 2012
@@ -286,6 +286,30 @@ public class TestFilterFileSystem {
 checkFsConf(flfs, conf, 3);
   }
 
+  @Test
+  public void testVerifyChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setVerifyChecksum(false);
+verify(mockFs).setVerifyChecksum(eq(false));
+reset(mockFs);
+fs.setVerifyChecksum(true);
+verify(mockFs).setVerifyChecksum(eq(true));
+  }
+
+  @Test
+  public void testWriteChecksumPassthru() {
+FileSystem mockFs = mock(FileSystem.class);
+FileSystem fs = new FilterFileSystem(mockFs);
+
+fs.setWriteChecksum(false);
+verify(mockFs).setWriteChecksum(eq(false));
+reset(mockFs);
+fs.setWriteChecksum(true);
+verify(mockFs).setWriteChecksum(eq(true));
+  }
+
   private void checkInit(FilterFileSystem fs, boolean expectInit)
   throws Exception {
 URI uri = URI.create("filter:/");

svn commit: r1367766 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

svn commit: r1367765 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

svn commit: r1367764 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt pom.xml

svn commit: r1367729 - /hadoop/common/branches/branch-2/hadoop-project/pom.xml

svn commit: r1367726 - /hadoop/common/trunk/hadoop-project/pom.xml

svn commit: r1367717 - /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

svn commit: r1367717 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

svn commit: r1367715 - /hadoop/common/branches/branch-2/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

svn commit: r1367715 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

svn commit: r1367713 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/site/apt/DeprecatedProperties.apt.vm

svn commit: r1367713 - /hadoop/common/trunk/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/StreamJob.java

svn commit: r1367705 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/

svn commit: r1367703 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/fs/

svn commit: r1367702 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/fs/FilterFileSystem.java src/test/java/org/apache/hadoop/fs/TestFilterFi

14 matches

Site Navigation

Mail list logo

Footer information