You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/03/11 18:56:15 UTC
svn commit: r1299412 - in /hadoop/common/branches/branch-0.23:
hadoop-project/ hadoop-project/src/site/
hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/
hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/
Author: suresh
Date: Sun Mar 11 17:55:58 2012
New Revision: 1299412
URL: http://svn.apache.org/viewvc?rev=1299412&view=rev
Log:
HDFS-1623. Merging change r1296534 from trunk to 0.23
Modified:
hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
Modified: hadoop/common/branches/branch-0.23/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/pom.xml?rev=1299412&r1=1299411&r2=1299412&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/pom.xml Sun Mar 11 17:55:58 2012
@@ -596,6 +596,11 @@
<version>${commons-daemon.version}</version>
</dependency>
<dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.42</version>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.1</version>
Modified: hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml?rev=1299412&r1=1299411&r2=1299412&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-project/src/site/site.xml Sun Mar 11 17:55:58 2012
@@ -54,6 +54,7 @@
</menu>
<menu name="HDFS" inherit="top">
+ <item name="High Availability" href="hadoop-yarn/hadoop-yarn-site/HDFSHighAvailability.html"/>
<item name="Federation" href="hadoop-yarn/hadoop-yarn-site/Federation.html"/>
<item name="WebHDFS REST API" href="hadoop-yarn/hadoop-yarn-site/WebHDFS.html"/>
<item name="HttpFS Gateway" href="hadoop-hdfs-httpfs/index.html"/>
Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java?rev=1299412&r1=1299411&r2=1299412&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/RetriableCommand.java Sun Mar 11 17:55:58 2012
@@ -22,7 +22,9 @@ package org.apache.hadoop.tools.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.io.retry.RetryPolicy;
+import org.apache.hadoop.io.retry.RetryPolicy.RetryAction;
import org.apache.hadoop.io.retry.RetryPolicies;
+import org.apache.hadoop.util.ThreadUtil;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
@@ -80,7 +82,7 @@ public abstract class RetriableCommand {
public Object execute(Object... arguments) throws Exception {
Exception latestException;
int counter = 0;
- do {
+ while (true) {
try {
return doExecute(arguments);
} catch(Exception exception) {
@@ -88,7 +90,13 @@ public abstract class RetriableCommand {
latestException = exception;
}
counter++;
- } while (retryPolicy.shouldRetry(latestException, counter, 0, true).equals(RetryPolicy.RetryAction.RETRY));
+ RetryAction action = retryPolicy.shouldRetry(latestException, counter, 0, true);
+ if (action.action == RetryPolicy.RetryAction.RetryDecision.RETRY) {
+ ThreadUtil.sleepAtLeastIgnoreInterrupts(action.delayMillis);
+ } else {
+ break;
+ }
+ }
throw new IOException("Couldn't run retriable-command: " + description,
latestException);
Modified: hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java?rev=1299412&r1=1299411&r2=1299412&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-tools/hadoop-distcp/src/test/java/org/apache/hadoop/tools/mapred/TestCopyMapper.java Sun Mar 11 17:55:58 2012
@@ -545,7 +545,12 @@ public class TestCopyMapper {
Assert.fail("Didn't expect the file to be copied");
} catch (AccessControlException ignore) {
} catch (Exception e) {
- if (e.getCause() == null || !(e.getCause() instanceof AccessControlException)) {
+ // We want to make sure the underlying cause of the exception is
+ // due to permissions error. The exception we're interested in is
+ // wrapped twice - once in RetriableCommand and again in CopyMapper
+ // itself.
+ if (e.getCause() == null || e.getCause().getCause() == null ||
+ !(e.getCause().getCause() instanceof AccessControlException)) {
throw new RuntimeException(e);
}
}