hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r557787 - in /lucene/hadoop/branches/branch-0.14: CHANGES.txt src/java/org/apache/hadoop/dfs/DataNode.java
Date Thu, 19 Jul 2007 21:48:27 GMT
Author: cutting
Date: Thu Jul 19 14:48:26 2007
New Revision: 557787

URL: http://svn.apache.org/viewvc?view=rev&rev=557787
Log:
Merge -r 557785:557786 from trunk to 0.14 branch.  Fixes: HADOOP-1624.

Modified:
    lucene/hadoop/branches/branch-0.14/CHANGES.txt
    lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/DataNode.java

Modified: lucene/hadoop/branches/branch-0.14/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/CHANGES.txt?view=diff&rev=557787&r1=557786&r2=557787
==============================================================================
--- lucene/hadoop/branches/branch-0.14/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.14/CHANGES.txt Thu Jul 19 14:48:26 2007
@@ -379,6 +379,8 @@
 118. HADOOP-1625.  Fix a "could not move files" exception in datanode.
      (Raghu Angadi via cutting)
 
+119. HADOOP-1624.  Fix an infinite loop in datanode. (Raghu Angadi via cutting)
+
 
 Release 0.13.0 - 2007-06-08
 

Modified: lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/DataNode.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/DataNode.java?view=diff&rev=557787&r1=557786&r2=557787
==============================================================================
--- lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/DataNode.java (original)
+++ lucene/hadoop/branches/branch-0.14/src/java/org/apache/hadoop/dfs/DataNode.java Thu Jul
19 14:48:26 2007
@@ -37,7 +37,6 @@
 import java.io.*;
 import java.net.*;
 import java.util.*;
-import org.apache.hadoop.dfs.FSConstants.StartupOption;
 import org.apache.hadoop.metrics.MetricsContext;
 import org.apache.hadoop.metrics.MetricsRecord;
 import org.apache.hadoop.metrics.Updater;
@@ -736,13 +735,12 @@
           break;
         case OP_READ_METADATA:
           readMetadata( in );
-          
+          break;
         default:
-          System.out.println("Faulty op: " + op);
           throw new IOException("Unknown opcode " + op + "in data stream");
         }
        } catch (Throwable t) {
-        LOG.error("DataXCeiver", t);
+        LOG.error("DataXceiver: " + StringUtils.stringifyException(t));
       } finally {
         try {
           xceiverCount.decr();



Mime
View raw message