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 2011/09/02 23:48:11 UTC
svn commit: r1164725 - in /hadoop/common/branches/branch-0.20-security:
CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
src/test/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java
Author: suresh
Date: Fri Sep 2 21:48:10 2011
New Revision: 1164725
URL: http://svn.apache.org/viewvc?rev=1164725&view=rev
Log:
Reverting the change r1164722
Modified:
hadoop/common/branches/branch-0.20-security/CHANGES.txt
hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
hadoop/common/branches/branch-0.20-security/src/test/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1164725&r1=1164724&r2=1164725&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Sep 2 21:48:10 2011
@@ -63,9 +63,6 @@ Release 0.20.205.0 - unreleased
HDFS-988. Fix bug where savenameSpace can corrupt edits log.
(Nicolas Spiegelberg via dhruba)
- HDFS-1054. remove sleep before retry for allocating a block.
- (Todd Lipcon via dhruba)
-
IMPROVEMENTS
MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via
Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1164725&r1=1164724&r2=1164725&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Fri Sep 2 21:48:10 2011
@@ -3054,12 +3054,19 @@ public class DFSClient implements FSCons
namenode.abandonBlock(block, src, clientName);
if (errorIndex < nodes.length) {
- LOG.info("Excluding datanode " + nodes[errorIndex]);
+ LOG.debug("Excluding datanode " + nodes[errorIndex]);
excludedNodes.add(nodes[errorIndex]);
}
// Connection failed. Let's wait a little bit and retry
retry = true;
+ try {
+ if (System.currentTimeMillis() - startTime > 5000) {
+ LOG.info("Waiting to find target node: " + nodes[0].getName());
+ }
+ Thread.sleep(6000);
+ } catch (InterruptedException iex) {
+ }
}
} while (retry && --count >= 0);