Merge -r 557785:557786 from trunk to 0.14 branch. Fixes: HADOOP-1624.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.14@557787 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -379,6 +379,8 @@ Branch 0.14 (unreleased changes)
 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
 

src/java/org/apache/hadoop/dfs/DataNode.java

@@ -37,7 +37,6 @@ import org.apache.hadoop.fs.FileUtil;
 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 @@ public class DataNode implements FSConstants, Runnable {
           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();