HADOOP-1885. Fix race condition in MiniDFSCluster shutdown. Contributed by Chris Douglas

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

CHANGES.txt

@@ -125,6 +125,9 @@ Trunk (unreleased changes)
     HADOOP-1840. Fix race condition which leads to task's diagnostic
     messages getting lost. (acmurthy) 
 
+    HADOOP-1885. Fix race condition in MiniDFSCluster shutdown.
+    (Chris Douglas via nigel)
+
   IMPROVEMENTS
 
     HADOOP-1266. Remove dependency of package org.apache.hadoop.net on 

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

@@ -119,7 +119,7 @@ public class DataNode implements FSConstants, Runnable {
   private DataNodeMetrics myMetrics;
   private static InetSocketAddress nameNodeAddr;
   private static DataNode datanodeObject = null;
-  private static Thread dataNodeThread = null;
+  private Thread dataNodeThread = null;
   String machineName;
   int defaultBytesPerChecksum = 512;
   private static class DataNodeMetrics implements Updater {
@@ -1334,10 +1334,10 @@ public class DataNode implements FSConstants, Runnable {
     String[] dataDirs = conf.getStrings("dfs.data.dir");
     DataNode dn = makeInstance(dataDirs, conf);
     if (dn != null) {
-      dataNodeThread = new Thread(dn, "DataNode: [" +
+      dn.dataNodeThread = new Thread(dn, "DataNode: [" +
                                   StringUtils.arrayToString(dataDirs) + "]");
-      dataNodeThread.setDaemon(true); // needed for JUnit testing
-      dataNodeThread.start();
+      dn.dataNodeThread.setDaemon(true); // needed for JUnit testing
+      dn.dataNodeThread.start();
     }
     return dn;
   }