svn commit: r638544 - in /hadoop/core/trunk: CHANGES.txt src/java/org/apache/hadoop/dfs/DataNode.java

[dh...@apache.org]

Author: dhruba
Date: Tue Mar 18 12:55:55 2008
New Revision: 638544

URL: http://svn.apache.org/viewvc?rev=638544&view=rev
Log:
HADOOP-3029. Datanode prints log message "firstbadlink" only if
it detects a bad connection to another datanode in the pipeline. (dhruba)


Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=638544&r1=638543&r2=638544&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Tue Mar 18 12:55:55 2008
@@ -269,6 +269,9 @@
     
     HADOOP-3006. Fix wrong packet size reported by DataNode when a block
     is being replicated. (rangadi)
+
+    HADOOP-3029. Datanode prints log message "firstbadlink" only if 
+    it detects a bad connection to another datanode in the pipeline. (dhruba)
     
 Release 0.16.2 - Unreleased
 

Modified: hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java?rev=638544&r1=638543&r2=638544&view=diff
==============================================================================
--- hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java (original)
+++ hadoop/core/trunk/src/java/org/apache/hadoop/dfs/DataNode.java Tue Mar 18 12:55:55 2008
@@ -1138,10 +1138,12 @@
             // read connect ack (only for clients, not for replication req)
             if (client.length() != 0) {
               firstBadLink = Text.readString(mirrorIn);
-              LOG.info("Datanode " + targets.length +
-                       " got response for connect ack " +
-                       " from downstream datanode with firstbadlink as " +
-                       firstBadLink);
+              if (LOG.isDebugEnabled() || firstBadLink.length() > 0) {
+                LOG.info("Datanode " + targets.length +
+                         " got response for connect ack " +
+                         " from downstream datanode with firstbadlink as " +
+                         firstBadLink);
+              }
             }
 
           } catch (IOException e) {
@@ -1161,9 +1163,11 @@
 
         // send connect ack back to source (only for clients)
         if (client.length() != 0) {
-          LOG.info("Datanode " + targets.length +
-                   " forwarding connect ack to upstream firstbadlink is " +
-                   firstBadLink);
+          if (LOG.isDebugEnabled() || firstBadLink.length() > 0) {
+            LOG.info("Datanode " + targets.length +
+                     " forwarding connect ack to upstream firstbadlink is " +
+                     firstBadLink);
+          }
           Text.writeString(replyOut, firstBadLink);
           replyOut.flush();
         }