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

[cd...@apache.org]

Author: cdouglas
Date: Thu May 15 11:41:03 2008
New Revision: 656781

URL: http://svn.apache.org/viewvc?rev=656781&view=rev
Log:
HADOOP-3393. Fix datanode shutdown to call DataBlockScanner::shutdown and close
its log, even if the scanner thread is not running. Contributed by lohit
vijayarenu.


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=656781&r1=656780&r2=656781&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu May 15 11:41:03 2008
@@ -257,6 +257,10 @@
 
     HADOOP-3391. Fix a findbugs warning introduced by HADOOP-3248 (rangadi)
 
+    HADOOP-3393. Fix datanode shutdown to call DataBlockScanner::shutdown and
+    close its log, even if the scanner thread is not running. (lohit vijayarenu
+    via cdouglas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

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=656781&r1=656780&r2=656781&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 Thu May 15 11:41:03 2008
@@ -555,10 +555,10 @@
     
     if(upgradeManager != null)
       upgradeManager.shutdownUpgrade();
-    if (blockScannerThread != null) {
+    if (blockScanner != null)
       blockScanner.shutdown();
+    if (blockScannerThread != null) 
       blockScannerThread.interrupt();
-    }
     if (storage != null) {
       try {
         this.storage.unlockAll();