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

[ni...@apache.org]

Author: nigel
Date: Wed Sep 12 15:59:48 2007
New Revision: 575114

URL: http://svn.apache.org/viewvc?rev=575114&view=rev
Log:
HADOOP-1885. Fix race condition in MiniDFSCluster shutdown.  Contributed by Chris Douglas

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=575114&r1=575113&r2=575114&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Sep 12 15:59:48 2007
@@ -125,6 +125,9 @@
     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 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java?rev=575114&r1=575113&r2=575114&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/dfs/DataNode.java Wed Sep 12 15:59:48 2007
@@ -119,7 +119,7 @@
   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 @@
     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;
   }