svn commit: r685877 - in /hadoop/core/branches/branch-0.18: CHANGES.txt src/mapred/org/apache/hadoop/mapred/TaskTracker.java

[ddas]

Author: ddas
Date: Thu Aug 14 05:56:36 2008
New Revision: 685877

URL: http://svn.apache.org/viewvc?rev=685877&view=rev
Log:
Merge from trunk onto 0.18 branch. Fixes HADOOP-3947.

Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=685877&r1=685876&r2=685877&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Aug 14 05:56:36 2008
@@ -790,6 +790,9 @@
     HADOOP-3901. Fix bin/hadoop to correctly set classpath under cygwin.
     (Tsz Wo (Nicholas) Sze via omalley)
 
+    HADOOP-3947. Fix a problem in tasktracker reinitialization. 
+    (Amareshwari Sriramadasu via ddas)
+
 Release 0.17.2 - 2008-08-11
 
   BUG FIXES

Modified: 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
URL: 
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java?rev=685877&r1=685876&r2=685877&view=diff
==============================================================================
--- 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
 (original)
+++ 
hadoop/core/branches/branch-0.18/src/mapred/org/apache/hadoop/mapred/TaskTracker.java
 Thu Aug 14 05:56:36 2008
@@ -456,6 +456,7 @@
                              "Map-events fetcher for all reduce tasks " + "on 
" + 
                              taskTrackerName);
     mapEventsFetcher.start();
+    this.running = true;
   }
   
   /** 
@@ -1332,7 +1333,6 @@
   public void run() {
     try {
       startCleanupThreads();
-      this.running = true;
       boolean denied = false;
       while (running && !shuttingDown && !denied) {
         boolean staleState = false;