Merging HDFS-1210 change r955448 from 0.20-append to 0.20-security

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1160443 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -82,6 +82,9 @@ Release 0.20.205.0 - unreleased
 
     MAPREDUCE-2852. Jira for YDH bug 2854624. (Kihwal Lee via eli)
 
+    HDFS-1210. DFSClient should log exception when block recovery fails.
+    (Todd Lipcon via dhruba)
+
 Release 0.20.204.0 - unreleased
 
   NEW FEATURES

src/hdfs/org/apache/hadoop/hdfs/DFSClient.java

@@ -2746,6 +2746,8 @@ public class DFSClient implements FSConstants, java.io.Closeable {
           primary = createClientDatanodeProtocolProxy(primaryNode, conf, block, accessToken, socketTimeout);
           newBlock = primary.recoverBlock(block, isAppend, newnodes);
         } catch (IOException e) {
+          LOG.warn("Failed recovery attempt #" + recoveryErrorCount +
+                   " from primary datanode " + primaryNode, e);
           recoveryErrorCount++;
           if (recoveryErrorCount > maxRecoveryErrorCount) {
             if (nodes.length > 1) {