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.



git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@656781 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -257,6 +257,10 @@ Trunk (unreleased changes)
 
     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

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

@@ -555,10 +555,10 @@ public class DataNode implements InterDatanodeProtocol, FSConstants, Runnable {
     
     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();