svn commit: r1075607 - in /hadoop/hdfs/branches/HDFS-1052: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

[su...@apache.org]

Author: suresh
Date: Tue Mar  1 01:26:42 2011
New Revision: 1075607

URL: http://svn.apache.org/viewvc?rev=1075607&view=rev
Log:
HDFS-1659. BPOfferService exits after one iteration incorrectly. Contributed by Tanping Wang.

Modified:
    hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1075607&r1=1075606&r2=1075607&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Tue Mar  1 01:26:42 2011
@@ -72,6 +72,9 @@ Trunk (unreleased changes)
     HDFS-1646. Federation: MiniDFSClsuter#waitActive() waits for ever 
     with the introduction of BPOfferService in datanode. (suresh)
 
+    HDFS-1659. BPOfferService exits after one iteration incorrectly.
+    (Tanping via suresh)
+
   IMPROVEMENTS
 
     HDFS-1510. Added test-patch.properties required by test-patch.sh (nigel)

Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1075607&r1=1075606&r2=1075607&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java Tue Mar  1 01:26:42 2011
@@ -956,8 +956,9 @@ public class DataNode extends Configured
           if (UnregisteredNodeException.class.getName().equals(reClass) ||
               DisallowedDatanodeException.class.getName().equals(reClass) ||
               IncorrectVersionException.class.getName().equals(reClass)) {
-            LOG.warn("DataNode is shutting down: " + 
+            LOG.warn("blockpool " + blockPoolId + " is shutting down: " + 
                 StringUtils.stringifyException(re));
+            shouldServiceRun = false;
             return;
           }
           LOG.warn(StringUtils.stringifyException(re));
@@ -969,8 +970,6 @@ public class DataNode extends Configured
           }
         } catch (IOException e) {
           LOG.warn(StringUtils.stringifyException(e));
-        } finally {
-          shouldServiceRun = false;
         }
       } // while (shouldRun && shouldServiceRun)
     } // offerService
@@ -1110,7 +1109,7 @@ public class DataNode extends Configured
           }
         }
       } finally {
-        LOG.info(bpRegistration + ":ending block pool service for: " 
+        LOG.warn(bpRegistration + ":ending block pool service for: " 
             + blockPoolId);
         cleanUp();
       }