svn commit: r1548096 - /hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml

2013-12-05 Thread kasha
Author: kasha
Date: Thu Dec  5 11:40:00 2013
New Revision: 1548096

URL: http://svn.apache.org/r1548096
Log:
Move cmccabe entry up to be sorted, and update kasha's site

Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml

Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml?rev=1548096r1=1548095r2=1548096view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml 
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml Thu 
Dec  5 11:40:00 2013
@@ -509,6 +509,14 @@
/tr
 
tr
+ tdcmccabe/td
+ tda href=http://www.club.cc.cmu.edu/~cmccabe;Colin Patrick 
McCabe/a/td
+ tdCloudera/td
+ tdHDFS/td
+ td-8/td
+   /tr
+
+   tr
  tdcnauroth/td
  tdChris Nauroth/td
  tdHortonworks/td
@@ -678,7 +686,7 @@
 
tr
  tdkasha/td
- tda href=http://kambatla.github.io/index.html;Karthik 
Kambatla/a/td
+ tda href=http://people.apache.org/~kasha;Karthik 
Kambatla/a/td
  tdCloudera/td
  td/td
  td-8/td
@@ -941,14 +949,6 @@
/tr
 
tr
- tdcmccabe/td
- tda href=http://www.club.cc.cmu.edu/~cmccabe;Colin Patrick 
McCabe/a/td
- tdCloudera/td
- tdHDFS/td
- td-8/td
-   /tr
-
-   tr
  tdzshao/td
  tda href=http://people.apache.org/~zshao;Zheng Shao/a/td
  tdFacebook/td




svn commit: r1548175 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:47:55 2013
New Revision: 1548175

URL: http://svn.apache.org/r1548175
Log:
HADOOP-10129. Distcp may succeed when it fails (daryn)

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

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=1548175r1=1548174r2=1548175view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 
 5 15:47:55 2013
@@ -460,6 +460,8 @@ Release 2.4.0 - UNRELEASED
 HADOOP-10135 writes to swift fs over partition size leave temp files and
 empty output file (David Dobbins via stevel)
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -2355,6 +2357,8 @@ Release 0.23.10 - UNRELEASED
 
   BUG FIXES
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES




svn commit: r1548175 - in /hadoop/common/trunk/hadoop-tools/hadoop-distcp: ./ src/main/java/org/apache/hadoop/tools/ src/main/java/org/apache/hadoop/tools/mapred/ src/test/java/org/apache/hadoop/tools

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:47:55 2013
New Revision: 1548175

URL: http://svn.apache.org/r1548175
Log:
HADOOP-10129. Distcp may succeed when it fails (daryn)

Added:

hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
Modified:
hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml

hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java

hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java

Modified: hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml?rev=1548175r1=1548174r2=1548175view=diff
==
--- hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-distcp/pom.xml Thu Dec  5 15:47:55 
2013
@@ -95,6 +95,11 @@
   scopetest/scope
   typetest-jar/type
 /dependency
+dependency
+  groupIdorg.mockito/groupId
+  artifactIdmockito-all/artifactId
+  scopetest/scope
+/dependency
   /dependencies
 
   build

Modified: 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java?rev=1548175r1=1548174r2=1548175view=diff
==
--- 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 (original)
+++ 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 Thu Dec  5 15:47:55 2013
@@ -32,6 +32,8 @@ import org.apache.hadoop.tools.util.Dist
 import org.apache.hadoop.mapreduce.security.TokenCache;
 import org.apache.hadoop.security.Credentials;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.Stack;
 
@@ -107,12 +109,13 @@ public class SimpleCopyListing extends C
   /** {@inheritDoc} */
   @Override
   public void doBuildListing(Path pathToListingFile, DistCpOptions options) 
throws IOException {
-
-SequenceFile.Writer fileListWriter = null;
-
+doBuildListing(getWriter(pathToListingFile), options);
+  }
+  
+  @VisibleForTesting
+  public void doBuildListing(SequenceFile.Writer fileListWriter,
+  DistCpOptions options) throws IOException {
 try {
-  fileListWriter = getWriter(pathToListingFile);
-
   for (Path path: options.getSourcePaths()) {
 FileSystem sourceFS = path.getFileSystem(getConf());
 path = makeQualified(path);
@@ -143,8 +146,10 @@ public class SimpleCopyListing extends C
   localFile, options);
 }
   }
+  fileListWriter.close();
+  fileListWriter = null;
 } finally {
-  IOUtils.closeStream(fileListWriter);
+  IOUtils.cleanup(LOG, fileListWriter);
 }
   }
 

Modified: 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java?rev=1548175r1=1548174r2=1548175view=diff
==
--- 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 (original)
+++ 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 Thu Dec  5 15:47:55 2013
@@ -30,6 +30,8 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.EnumSet;
 
@@ -176,7 +178,8 @@ public class RetriableFileCopyCommand ex
 return new Path(root, .distcp.tmp. + 
context.getTaskAttemptID().toString());
   }
 
-  private long copyBytes(FileStatus sourceFileStatus, OutputStream outStream,
+  @VisibleForTesting
+  long copyBytes(FileStatus sourceFileStatus, OutputStream outStream,
  int bufferSize, Mapper.Context context)
   throws IOException {
 Path source = sourceFileStatus.getPath();
@@ -193,6 +196,8 @@ public class RetriableFileCopyCommand ex
 updateContextStatus(totalBytesRead, context, sourceFileStatus);
 bytesRead = inStream.read(buf);
   }
+  outStream.close();
+  outStream = null;
 } finally {
   IOUtils.cleanup(LOG, outStream, 

svn commit: r1548176 - in /hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp: ./ src/main/java/org/apache/hadoop/tools/ src/main/java/org/apache/hadoop/tools/mapred/ src/test/java/org/apache/

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:51:28 2013
New Revision: 1548176

URL: http://svn.apache.org/r1548176
Log:
svn merge -c 1548175 FIXES: HADOOP-10129. Distcp may succeed when it fails 
(daryn)

Added:

hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
  - copied unchanged from r1548175, 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml

hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java

hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java

Modified: hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml?rev=1548176r1=1548175r2=1548176view=diff
==
--- hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml 
(original)
+++ hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/pom.xml Thu Dec  
5 15:51:28 2013
@@ -95,6 +95,11 @@
   scopetest/scope
   typetest-jar/type
 /dependency
+dependency
+  groupIdorg.mockito/groupId
+  artifactIdmockito-all/artifactId
+  scopetest/scope
+/dependency
   /dependencies
 
   build

Modified: 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java?rev=1548176r1=1548175r2=1548176view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 Thu Dec  5 15:51:28 2013
@@ -32,6 +32,8 @@ import org.apache.hadoop.tools.util.Dist
 import org.apache.hadoop.mapreduce.security.TokenCache;
 import org.apache.hadoop.security.Credentials;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.Stack;
 
@@ -107,12 +109,13 @@ public class SimpleCopyListing extends C
   /** {@inheritDoc} */
   @Override
   public void doBuildListing(Path pathToListingFile, DistCpOptions options) 
throws IOException {
-
-SequenceFile.Writer fileListWriter = null;
-
+doBuildListing(getWriter(pathToListingFile), options);
+  }
+  
+  @VisibleForTesting
+  public void doBuildListing(SequenceFile.Writer fileListWriter,
+  DistCpOptions options) throws IOException {
 try {
-  fileListWriter = getWriter(pathToListingFile);
-
   for (Path path: options.getSourcePaths()) {
 FileSystem sourceFS = path.getFileSystem(getConf());
 path = makeQualified(path);
@@ -140,8 +143,10 @@ public class SimpleCopyListing extends C
   writeToFileListing(fileListWriter, rootStatus, sourcePathRoot, 
localFile);
 }
   }
+  fileListWriter.close();
+  fileListWriter = null;
 } finally {
-  IOUtils.closeStream(fileListWriter);
+  IOUtils.cleanup(LOG, fileListWriter);
 }
   }
 

Modified: 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java?rev=1548176r1=1548175r2=1548176view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 Thu Dec  5 15:51:28 2013
@@ -30,6 +30,8 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.EnumSet;
 
@@ -176,7 +178,8 @@ public class RetriableFileCopyCommand ex
 return new Path(root, .distcp.tmp. + 
context.getTaskAttemptID().toString());
   }
 
-  private long copyBytes(FileStatus sourceFileStatus, OutputStream outStream,
+  @VisibleForTesting
+  long copyBytes(FileStatus sourceFileStatus, 

svn commit: r1548176 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:51:28 2013
New Revision: 1548176

URL: http://svn.apache.org/r1548176
Log:
svn merge -c 1548175 FIXES: HADOOP-10129. Distcp may succeed when it fails 
(daryn)

Modified:

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

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=1548176r1=1548175r2=1548176view=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 
Thu Dec  5 15:51:28 2013
@@ -169,6 +169,8 @@ Release 2.4.0 - UNRELEASED
 HADOOP-10135 writes to swift fs over partition size leave temp files and
 empty output file (David Dobbins via stevel)
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -2090,6 +2092,8 @@ Release 0.23.10 - UNRELEASED
 
   BUG FIXES
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES




svn commit: r1548178 - in /hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp: ./ src/main/java/org/apache/hadoop/tools/ src/main/java/org/apache/hadoop/tools/mapred/ src/test/java/org/apac

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:54:27 2013
New Revision: 1548178

URL: http://svn.apache.org/r1548178
Log:
HADOOP-10129. Distcp may succeed when it fails (daryn)

Added:

hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml

hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java

hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java

Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml?rev=1548178r1=1548177r2=1548178view=diff
==
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml 
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/pom.xml Thu 
Dec  5 15:54:27 2013
@@ -90,6 +90,11 @@
   scopetest/scope
   typetest-jar/type
 /dependency
+dependency
+  groupIdorg.mockito/groupId
+  artifactIdmockito-all/artifactId
+  scopetest/scope
+/dependency
   /dependencies
 
   build

Modified: 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java?rev=1548178r1=1548177r2=1548178view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 Thu Dec  5 15:54:27 2013
@@ -32,6 +32,8 @@ import org.apache.hadoop.tools.util.Dist
 import org.apache.hadoop.mapreduce.security.TokenCache;
 import org.apache.hadoop.security.Credentials;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.Stack;
 
@@ -107,12 +109,13 @@ public class SimpleCopyListing extends C
   /** {@inheritDoc} */
   @Override
   public void doBuildListing(Path pathToListingFile, DistCpOptions options) 
throws IOException {
-
-SequenceFile.Writer fileListWriter = null;
-
+doBuildListing(getWriter(pathToListingFile), options);
+  }
+  
+  @VisibleForTesting
+  public void doBuildListing(SequenceFile.Writer fileListWriter,
+  DistCpOptions options) throws IOException {
 try {
-  fileListWriter = getWriter(pathToListingFile);
-
   for (Path path: options.getSourcePaths()) {
 FileSystem sourceFS = path.getFileSystem(getConf());
 path = makeQualified(path);
@@ -140,8 +143,10 @@ public class SimpleCopyListing extends C
   writeToFileListing(fileListWriter, rootStatus, sourcePathRoot, 
localFile);
 }
   }
+  fileListWriter.close();
+  fileListWriter = null;
 } finally {
-  IOUtils.closeStream(fileListWriter);
+  IOUtils.cleanup(LOG, fileListWriter);
 }
   }
 

Modified: 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java?rev=1548178r1=1548177r2=1548178view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
 Thu Dec  5 15:54:27 2013
@@ -30,6 +30,8 @@ import org.apache.hadoop.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.EnumSet;
 
@@ -176,7 +178,8 @@ public class RetriableFileCopyCommand ex
 return new Path(root, .distcp.tmp. + 
context.getTaskAttemptID().toString());
   }
 
-  private long copyBytes(FileStatus sourceFileStatus, OutputStream outStream,
+  @VisibleForTesting
+  long copyBytes(FileStatus sourceFileStatus, OutputStream outStream,
  int bufferSize, Mapper.Context context)
   throws IOException {
 Path source = 

svn commit: r1548178 - /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 15:54:27 2013
New Revision: 1548178

URL: http://svn.apache.org/r1548178
Log:
HADOOP-10129. Distcp may succeed when it fails (daryn)

Modified:

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

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=1548178r1=1548177r2=1548178view=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
 Thu Dec  5 15:54:27 2013
@@ -43,6 +43,8 @@ Release 0.23.10 - 2013-12-09
 HADOOP-10091. Job with a har archive as input fails on 0.23 (Jason Dere
 and Jason Lowe via jlowe)
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES




svn commit: r1548179 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java

2013-12-05 Thread jlowe
Author: jlowe
Date: Thu Dec  5 16:00:40 2013
New Revision: 1548179

URL: http://svn.apache.org/r1548179
Log:
HADOOP-10081. Client.setupIOStreams can leak socket resources on exception or 
error. Contributed by Tsuyoshi OZAWA

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/ipc/Client.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=1548179r1=1548178r2=1548179view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 
 5 16:00:40 2013
@@ -529,6 +529,9 @@ Release 2.3.0 - UNRELEASED
 HDFS-5560. Trash configuration log statements prints incorrect units.
 (Josh Elser via Andrew Wang)
 
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548179r1=1548178r2=1548179view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 Thu Dec  5 16:00:40 2013
@@ -1158,6 +1158,7 @@ public class Client {
 // cleanup calls
 cleanupCalls();
   }
+  closeConnection();
   if (LOG.isDebugEnabled())
 LOG.debug(getName() + : closed);
 }




svn commit: r1548181 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java

2013-12-05 Thread jlowe
Author: jlowe
Date: Thu Dec  5 16:06:09 2013
New Revision: 1548181

URL: http://svn.apache.org/r1548181
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket 
resources on exception or error. Contributed by Tsuyoshi OZAWA

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/ipc/Client.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=1548181r1=1548180r2=1548181view=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 
Thu Dec  5 16:06:09 2013
@@ -238,6 +238,9 @@ Release 2.3.0 - UNRELEASED
 HDFS-5560. Trash configuration log statements prints incorrect units.
 (Josh Elser via Andrew Wang)
 
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548181r1=1548180r2=1548181view=diff
==
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 Thu Dec  5 16:06:09 2013
@@ -1158,6 +1158,7 @@ public class Client {
 // cleanup calls
 cleanupCalls();
   }
+  closeConnection();
   if (LOG.isDebugEnabled())
 LOG.debug(getName() + : closed);
 }




svn commit: r1548184 - in /hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java

2013-12-05 Thread jlowe
Author: jlowe
Date: Thu Dec  5 16:09:38 2013
New Revision: 1548184

URL: http://svn.apache.org/r1548184
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket 
resources on exception or error. Contributed by Tsuyoshi OZAWA

Modified:

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

hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548184r1=1548183r2=1548184view=diff
==
--- 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Dec  5 16:09:38 2013
@@ -70,6 +70,9 @@ Release 2.3.0 - UNRELEASED
 HDFS-5560. Trash configuration log statements prints incorrect units.
 (Josh Elser via Andrew Wang)
 
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548184r1=1548183r2=1548184view=diff
==
--- 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 (original)
+++ 
hadoop/common/branches/branch-2.3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 Thu Dec  5 16:09:38 2013
@@ -1104,6 +1104,7 @@ public class Client {
 // cleanup calls
 cleanupCalls();
   }
+  closeConnection();
   if (LOG.isDebugEnabled())
 LOG.debug(getName() + : closed);
 }




svn commit: r1548190 - in /hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common: CHANGES.txt src/main/java/org/apache/hadoop/ipc/Client.java

2013-12-05 Thread jlowe
Author: jlowe
Date: Thu Dec  5 16:14:45 2013
New Revision: 1548190

URL: http://svn.apache.org/r1548190
Log:
svn merge -c 1548179 FIXES: HADOOP-10081. Client.setupIOStreams can leak socket 
resources on exception or error. Contributed by Tsuyoshi OZAWA

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/ipc/Client.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=1548190r1=1548189r2=1548190view=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
 Thu Dec  5 16:14:45 2013
@@ -12,6 +12,9 @@ Release 0.23.11 - UNRELEASED
 
   BUG FIXES
 
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 0.23.10 - 2013-12-09
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1548190r1=1548189r2=1548190view=diff
==
--- 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 (original)
+++ 
hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
 Thu Dec  5 16:14:45 2013
@@ -894,6 +894,7 @@ public class Client {
 // cleanup calls
 cleanupCalls();
   }
+  closeConnection();
   if (LOG.isDebugEnabled())
 LOG.debug(getName() + : closed);
 }




svn commit: r1548194 - /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 16:26:43 2013
New Revision: 1548194

URL: http://svn.apache.org/r1548194
Log:
Move HADOOP-10129 from 0.23.10 to 0.23.11 in CHANGES.txt

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

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=1548194r1=1548193r2=1548194view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 
 5 16:26:43 2013
@@ -2339,6 +2339,20 @@ Release 2.0.0-alpha - 05-23-2012
 HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
 by Jersey (Alejandro Abdelnur via atm)
 
+Release 0.23.11 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.10 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -2360,8 +2374,6 @@ Release 0.23.10 - UNRELEASED
 
   BUG FIXES
 
-HADOOP-10129. Distcp may succeed when it fails (daryn)
-
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES




svn commit: r1548196 - /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

2013-12-05 Thread daryn
Author: daryn
Date: Thu Dec  5 16:28:57 2013
New Revision: 1548196

URL: http://svn.apache.org/r1548196
Log:
Move HADOOP-10129 from 0.23.10 to 0.23.11 in CHANGES.txt

Modified:

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

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=1548196r1=1548195r2=1548196view=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 
Thu Dec  5 16:28:57 2013
@@ -2074,6 +2074,20 @@ Release 2.0.0-alpha - 05-23-2012
 HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
 by Jersey (Alejandro Abdelnur via atm)
 
+Release 0.23.11 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.10 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -2095,8 +2109,6 @@ Release 0.23.10 - UNRELEASED
 
   BUG FIXES
 
-HADOOP-10129. Distcp may succeed when it fails (daryn)
-
 Release 0.23.9 - 2013-07-08
 
   INCOMPATIBLE CHANGES




svn commit: r1548215 - in /hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java

2013-12-05 Thread jeagles
Author: jeagles
Date: Thu Dec  5 17:37:13 2013
New Revision: 1548215

URL: http://svn.apache.org/r1548215
Log:
HADOOP-10058. TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately 
fails on trunk (Chen He via jeagles)

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

hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.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=1548215r1=1548214r2=1548215view=diff
==
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Dec 
 5 17:37:13 2013
@@ -462,6 +462,9 @@ Release 2.4.0 - UNRELEASED
 
 HADOOP-10129. Distcp may succeed when it fails (daryn)
 
+HADOOP-10058. 
TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately
+fails on trunk (Chen He via jeagles)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java?rev=1548215r1=1548214r2=1548215view=diff
==
--- 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
 (original)
+++ 
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java
 Thu Dec  5 17:37:13 2013
@@ -85,6 +85,7 @@ public class TestMetricsSystemImpl {
   }
 
   @Test public void testInitFirstVerifyStopInvokedImmediately() throws 
Exception {
+DefaultMetricsSystem.shutdown();
 new ConfigBuilder().add(*.period, 8)
 //.add(test.sink.plugin.urls, getPluginUrlsAsString())
 .add(test.sink.test.class, TestSink.class.getName())




svn commit: r1548329 - in /hadoop/common/branches/HDFS-2832/hadoop-common-project: hadoop-common/ hadoop-common/src/main/java/ hadoop-common/src/main/java/org/apache/hadoop/http/ hadoop-common/src/mai

2013-12-05 Thread arp
Author: arp
Date: Thu Dec  5 23:41:09 2013
New Revision: 1548329

URL: http://svn.apache.org/r1548329
Log:
Merging r1547658 through r1548328 from trunk to branch HDFS-2832

Added:

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestIdUserGroup.java
  - copied unchanged from r1548328, 
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestIdUserGroup.java
Modified:

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java

hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java

Modified: 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548329r1=1548328r2=1548329view=diff
==
--- 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
 Thu Dec  5 23:41:09 2013
@@ -393,6 +393,8 @@ Release 2.4.0 - UNRELEASED
 HADOOP-10127. Add ipc.client.connect.retry.interval to control the 
frequency
 of connection retries (Karthik Kambatla via Sandy Ryza)
 
+HADOOP-10102. Update commons IO from 2.1 to 2.4 (Akira Ajisaka via stevel)
+
   OPTIMIZATIONS
 
 HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -458,6 +460,11 @@ Release 2.4.0 - UNRELEASED
 HADOOP-10135 writes to swift fs over partition size leave temp files and
 empty output file (David Dobbins via stevel)
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
+HADOOP-10058. 
TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately
+fails on trunk (Chen He via jeagles)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -525,6 +532,9 @@ Release 2.3.0 - UNRELEASED
 HDFS-5560. Trash configuration log statements prints incorrect units.
 (Josh Elser via Andrew Wang)
 
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES
@@ -2332,6 +2342,20 @@ Release 2.0.0-alpha - 05-23-2012
 HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
 by Jersey (Alejandro Abdelnur via atm)
 
+Release 0.23.11 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.10 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt
--
  Merged 
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1547755
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1547658-1548328

Propchange: 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1547658-1548328

Modified: 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java?rev=1548329r1=1548328r2=1548329view=diff
==
--- 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
 (original)
+++ 
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java
 Thu Dec  5 23:41:09 2013
@@ -31,15 +31,25 @@ public class HttpConfig {
   private static Policy policy;
   public enum Policy {
 

[Hadoop Wiki] Update of Roadmap by Arun C Murthy

2013-12-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Hadoop Wiki for change 
notification.

The Roadmap page has been changed by Arun C Murthy:
https://wiki.apache.org/hadoop/Roadmap?action=diffrev1=20rev2=21

  
  == Hadoop 2.x Releases ==
  
- === hadoop-2.3 ===
- 
- Hadoop 2.3 is essentially a bug-fix release and is targetted for 2nd week of 
December, 2013.
- 
  === hadoop-2.4 ===
  
  Hadoop 2.4 is a release with several substantial features, such as:
@@ -70, +66 @@

  
  Currently, we are targeting this for January, 2014.
  
+ === hadoop-2.3 ===
+ 
+ Hadoop 2.3 is essentially a bug-fix release and is targetted for 2nd week of 
December, 2013.
+ 


[Hadoop Wiki] Update of Roadmap by Arun C Murthy

2013-12-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Hadoop Wiki for change 
notification.

The Roadmap page has been changed by Arun C Murthy:
https://wiki.apache.org/hadoop/Roadmap?action=diffrev1=21rev2=22

  
  For more details on how releases are created, see HowToRelease.
  
- == Sustaining Releases ==
- 
- The current sustaining branch is branch-1. It was branched from branch-0.20 
with many features including security integrated in.
- 
- Because 0.21 had already been released, we added a new level to the release 
numbering. Thus version numbers on this branch look like 0.20.X.Y where X is  
200 and denotes the minor release from the branch. The Y denotes the point 
release that is intended for critical bug fixes to a previous sustaining 
release. The 0.205.0.1 release became the Hadoop 1.0.0 release, and we are now 
back to a three part (major.minor.point) version scheme. Changes for the next 
point releases of the sustaining branch need to be merged from branch-1 to 
branch-1.0 (or branch-1.1 etc). See the 
[[http://hadoop.apache.org/common/releases.html|Hadoop Releases Page]] to see 
the full list of sustaining releases.
- 
- The Release Manager for a sustaining release should announce the code freeze 
date as far in advance as possible, on the general list.  Prior to that date, 
anyone interested in contributing to the release submits a patch to branch-1, 
and adds the sustaining release number to “Target Version/s” in the Jira.  Only 
functionality already committed to trunk should be submitted to a sustaining 
release.  (The exception is if the functionality is not applicable to trunk.)  
The Release Manager is fully responsible for release content and timelines.
- 
- After the code freeze date, the Release Manager will generate the release 
candidate and call a release vote in the usual way.  After that point, only 
patches for issues rated “blocker” may be added to the release.
- 
  == Hadoop 2.x Releases ==
  
  === hadoop-2.4 ===
@@ -70, +60 @@

  
  Hadoop 2.3 is essentially a bug-fix release and is targetted for 2nd week of 
December, 2013.
  
+ === hadoop-2.2 ===
+ 
+ 'Released: 2013-10-13' 
+ 
+  * HDFS
+   * High Availability for HDFS
+   * HDFS Federation
+   * HDFS Snapshots
+   * NFSv3 access to data in HDFS
+  * YARN
+   * Stable
+   * API Stability 
+  * Map-Reduce
+   * Binary Compatibility for MapReduce applications between Hadoop v1 and 
Hadoop v2 to ease migration
+  * Overall
+   * Stable
+   * Performance
+   * Support for running Hadoop on Microsoft Windows
+   * Integration testing for the entire Apache Hadoop ecosystem at the ASF.
+ 
+ == Hadoop 1.x - Sustaining Releases ==
+ 
+ The current sustaining branch is branch-1. It was branched from branch-0.20 
with many features including security integrated in.
+ 
+ Because 0.21 had already been released, we added a new level to the release 
numbering. Thus version numbers on this branch look like 0.20.X.Y where X is  
200 and denotes the minor release from the branch. The Y denotes the point 
release that is intended for critical bug fixes to a previous sustaining 
release. The 0.205.0.1 release became the Hadoop 1.0.0 release, and we are now 
back to a three part (major.minor.point) version scheme. Changes for the next 
point releases of the sustaining branch need to be merged from branch-1 to 
branch-1.0 (or branch-1.1 etc). See the 
[[http://hadoop.apache.org/common/releases.html|Hadoop Releases Page]] to see 
the full list of sustaining releases.
+ 
+ The Release Manager for a sustaining release should announce the code freeze 
date as far in advance as possible, on the general list.  Prior to that date, 
anyone interested in contributing to the release submits a patch to branch-1, 
and adds the sustaining release number to “Target Version/s” in the Jira.  Only 
functionality already committed to trunk should be submitted to a sustaining 
release.  (The exception is if the functionality is not applicable to trunk.)  
The Release Manager is fully responsible for release content and timelines.
+ 
+ After the code freeze date, the Release Manager will generate the release 
candidate and call a release vote in the usual way.  After that point, only 
patches for issues rated “blocker” may be added to the release.
+ 


[Hadoop Wiki] Update of ContributorsGroup by EliCollins

2013-12-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Hadoop Wiki for change 
notification.

The ContributorsGroup page has been changed by EliCollins:
https://wiki.apache.org/hadoop/ContributorsGroup?action=diffrev1=69rev2=70

   * AlbertStrasheim
   * AleksShulman
   * AlexDorman
+  * AlejandroAbdelnur
   * AlexLoddengaard
   * AlexMargolin
   * AlexNewman


[Hadoop Wiki] Update of Roadmap by AlejandroAbdelnur

2013-12-05 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on Hadoop Wiki for change 
notification.

The Roadmap page has been changed by AlejandroAbdelnur:
https://wiki.apache.org/hadoop/Roadmap?action=diffrev1=22rev2=23

  Hadoop 2.4 is a release with several substantial features, such as:
   * HDFS
* HDFS Symlinks
+  * YARN 
-   * YARN Application History Server 
[[https://issues.apache.org/jira/browse/YARN-321|YARN-321]]
+   * Application History Server 
[[https://issues.apache.org/jira/browse/YARN-321|YARN-321]]
-  * MapReduce
+   * Enable external systems/frameworks to share resources with Hadoop 
leveraging Yarn resource scheduling (unmanged containers) 
[[https://issues.apache.org/jira/browse/YARN-1404|YARN-1404]]
+  * MAPREDUCE
  
  Currently, we are targeting this for January, 2014.
  


svn commit: r1548386 - in /hadoop/common/branches/HDFS-4685: ./ hadoop-project/ hadoop-tools/hadoop-distcp/ hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/ hadoop-tools/hadoop-distcp

2013-12-05 Thread cnauroth
Author: cnauroth
Date: Fri Dec  6 06:57:15 2013
New Revision: 1548386

URL: http://svn.apache.org/r1548386
Log:
Merge trunk to HDFS-4685.

Added:

hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
  - copied unchanged from r1548385, 
hadoop/common/trunk/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestRetriableFileCopyCommand.java
Modified:
hadoop/common/branches/HDFS-4685/   (props changed)
hadoop/common/branches/HDFS-4685/hadoop-project/pom.xml
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/pom.xml

hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java

hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java

hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/TestCopyListing.java

Propchange: hadoop/common/branches/HDFS-4685/
--
  Merged /hadoop/common/branches/branch-2:r1547755
  Merged /hadoop/common/trunk:r1547224-1548385

Modified: hadoop/common/branches/HDFS-4685/hadoop-project/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-project/pom.xml?rev=1548386r1=1548385r2=1548386view=diff
==
--- hadoop/common/branches/HDFS-4685/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-4685/hadoop-project/pom.xml Fri Dec  6 06:57:15 
2013
@@ -467,7 +467,7 @@
   dependency
 groupIdcommons-io/groupId
 artifactIdcommons-io/artifactId
-version2.1/version
+version2.4/version
   /dependency
 
   dependency

Modified: hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/pom.xml
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/pom.xml?rev=1548386r1=1548385r2=1548386view=diff
==
--- hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/pom.xml 
(original)
+++ hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/pom.xml Fri Dec 
 6 06:57:15 2013
@@ -95,6 +95,11 @@
   scopetest/scope
   typetest-jar/type
 /dependency
+dependency
+  groupIdorg.mockito/groupId
+  artifactIdmockito-all/artifactId
+  scopetest/scope
+/dependency
   /dependencies
 
   build

Modified: 
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java?rev=1548386r1=1548385r2=1548386view=diff
==
--- 
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 (original)
+++ 
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/SimpleCopyListing.java
 Fri Dec  6 06:57:15 2013
@@ -32,6 +32,8 @@ import org.apache.hadoop.tools.util.Dist
 import org.apache.hadoop.mapreduce.security.TokenCache;
 import org.apache.hadoop.security.Credentials;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.*;
 import java.util.Stack;
 
@@ -107,12 +109,13 @@ public class SimpleCopyListing extends C
   /** {@inheritDoc} */
   @Override
   public void doBuildListing(Path pathToListingFile, DistCpOptions options) 
throws IOException {
-
-SequenceFile.Writer fileListWriter = null;
-
+doBuildListing(getWriter(pathToListingFile), options);
+  }
+  
+  @VisibleForTesting
+  public void doBuildListing(SequenceFile.Writer fileListWriter,
+  DistCpOptions options) throws IOException {
 try {
-  fileListWriter = getWriter(pathToListingFile);
-
   for (Path path: options.getSourcePaths()) {
 FileSystem sourceFS = path.getFileSystem(getConf());
 path = makeQualified(path);
@@ -143,8 +146,10 @@ public class SimpleCopyListing extends C
   localFile, options);
 }
   }
+  fileListWriter.close();
+  fileListWriter = null;
 } finally {
-  IOUtils.closeStream(fileListWriter);
+  IOUtils.cleanup(LOG, fileListWriter);
 }
   }
 

Modified: 
hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/RetriableFileCopyCommand.java?rev=1548386r1=1548385r2=1548386view=diff

svn commit: r1548386 - in /hadoop/common/branches/HDFS-4685/hadoop-common-project: hadoop-common/ hadoop-common/src/main/docs/ hadoop-common/src/main/java/ hadoop-common/src/main/java/org/apache/hadoo

2013-12-05 Thread cnauroth
Author: cnauroth
Date: Fri Dec  6 06:57:15 2013
New Revision: 1548386

URL: http://svn.apache.org/r1548386
Log:
Merge trunk to HDFS-4685.

Added:

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestIdUserGroup.java
  - copied unchanged from r1548385, 
hadoop/common/trunk/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/nfs/nfs3/TestIdUserGroup.java
Modified:

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
   (props changed)

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpConfig.java

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/site/apt/ClusterSetup.apt.vm

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/core/
   (props changed)

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/impl/TestMetricsSystemImpl.java

hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/nfs/nfs3/IdUserGroup.java

Modified: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1548386r1=1548385r2=1548386view=diff
==
--- 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
 Fri Dec  6 06:57:15 2013
@@ -390,6 +390,11 @@ Release 2.4.0 - UNRELEASED
 
 HADOOP-10126. LightWeightGSet log message is confusing. (Vinay via suresh)
 
+HADOOP-10127. Add ipc.client.connect.retry.interval to control the 
frequency
+of connection retries (Karthik Kambatla via Sandy Ryza)
+
+HADOOP-10102. Update commons IO from 2.1 to 2.4 (Akira Ajisaka via stevel)
+
   OPTIMIZATIONS
 
 HADOOP-9748. Reduce blocking on UGI.ensureInitialized (daryn)
@@ -455,6 +460,11 @@ Release 2.4.0 - UNRELEASED
 HADOOP-10135 writes to swift fs over partition size leave temp files and
 empty output file (David Dobbins via stevel)
 
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
+HADOOP-10058. 
TestMetricsSystemImpl#testInitFirstVerifyStopInvokedImmediately
+fails on trunk (Chen He via jeagles)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
@@ -519,6 +529,12 @@ Release 2.3.0 - UNRELEASED
 HADOOP-10130. RawLocalFS::LocalFSFileInputStream.pread does not track
 FS::Statistics (Binglin Chang via Colin Patrick McCabe)
 
+HDFS-5560. Trash configuration log statements prints incorrect units.
+(Josh Elser via Andrew Wang)
+
+HADOOP-10081. Client.setupIOStreams can leak socket resources on exception
+or error (Tsuyoshi OZAWA via jlowe)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES
@@ -2326,6 +2342,20 @@ Release 2.0.0-alpha - 05-23-2012
 HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required
 by Jersey (Alejandro Abdelnur via atm)
 
+Release 0.23.11 - UNRELEASED
+
+  INCOMPATIBLE CHANGES
+
+  NEW FEATURES
+
+  IMPROVEMENTS
+
+  OPTIMIZATIONS
+
+  BUG FIXES
+
+HADOOP-10129. Distcp may succeed when it fails (daryn)
+
 Release 0.23.10 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/CHANGES.txt
--
  Merged 
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1547755
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1547224-1548385

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/docs/
--
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1547224-1548385

Propchange: 
hadoop/common/branches/HDFS-4685/hadoop-common-project/hadoop-common/src/main/java/