svn commit: r669785 - in /hadoop/core/trunk: CHANGES.txt src/mapred/org/apache/hadoop/mapred/JobInProgress.java

[dd...@apache.org]

Author: ddas
Date: Thu Jun 19 21:38:54 2008
New Revision: 669785

URL: http://svn.apache.org/viewvc?rev=669785&view=rev
Log:
HADOOP-3590. Null pointer exception in JobTracker when the task tracker is not yet resolved. Contributed by Amar Ramesh Kamat.

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=669785&r1=669784&r2=669785&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Thu Jun 19 21:38:54 2008
@@ -637,6 +637,9 @@
     HADOOP-3599. Fix JobConf::setCombineOnceOnly to modify the instance rather
     than a parameter. (Owen O'Malley via cdouglas)
 
+    HADOOP-3590. Null pointer exception in JobTracker when the task tracker is 
+    not yet resolved. (Amar Ramesh Kamat via ddas)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java?rev=669785&r1=669784&r2=669785&view=diff
==============================================================================
--- hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ hadoop/core/trunk/src/mapred/org/apache/hadoop/mapred/JobInProgress.java Thu Jun 19 21:38:54 2008
@@ -1055,6 +1055,7 @@
     }
 
     Node node = jobtracker.getNode(tts.getHost());
+    Node nodeParentAtMaxLevel = null;
     
     // For scheduling a map task, we have two caches and a list (optional)
     //  I)   one for non-running task
@@ -1111,6 +1112,8 @@
         }
         key = key.getParent();
       }
+      // get the node parent at max level
+      nodeParentAtMaxLevel = JobTracker.getParentNode(node, maxLevel - 1);
     }
 
     //2. Search breadth-wise across parents at max level for non-running 
@@ -1119,8 +1122,6 @@
     //     - node information for the tracker is missing (tracker's topology
     //       info not obtained yet)
 
-    // get the node parent at max level
-    Node nodeParentAtMaxLevel = JobTracker.getParentNode(node, maxLevel - 1);
     // collection of node at max level in the cache structure
     Collection<Node> nodesAtMaxLevel = jobtracker.getNodesAtMaxLevel();