svn commit: r555649 - in /lucene/hadoop/trunk: CHANGES.txt src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java

[omalley]

Author: omalley
Date: Thu Jul 12 07:48:38 2007
New Revision: 555649

URL: http://svn.apache.org/viewvc?view=rev&rev=555649
Log:
HADOOP-1596. Fix the parsing of taskids in streaming.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
    
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=555649&r1=555648&r2=555649
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Jul 12 07:48:38 2007
@@ -325,6 +325,8 @@
 100. HADOOP-1590.  Use relative urls in jobtracker jsp pages, so that
      webapp can be used in non-root contexts.  (Thomas Friol via cutting)
 
+101. HADOOP-1596.  Fix the parsing of taskids by streaming and improve the
+     error reporting. (omalley)
 
 Release 0.13.0 - 2007-06-08
 

Modified: 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java?view=diff&rev=555649&r1=555648&r2=555649
==============================================================================
--- 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
 (original)
+++ 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/PipeMapRed.java
 Thu Jul 12 07:48:38 2007
@@ -177,6 +177,8 @@
 
     } catch (Exception e) {
       logStackTrace(e);
+      LOG.error("configuration exception", e);
+      throw new RuntimeException("configuration exception", e);
     }
   }
 

Modified: 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java?view=diff&rev=555649&r1=555648&r2=555649
==============================================================================
--- 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
 (original)
+++ 
lucene/hadoop/trunk/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamUtil.java
 Thu Jul 12 07:48:38 2007
@@ -446,10 +446,10 @@
       res.execid = 0;
     } else {
       String[] e = id.split("_");
-      res.mapTask = e[2].equals("m");
-      res.jobid = e[1];
-      res.taskid = Integer.parseInt(e[3]);
-      res.execid = Integer.parseInt(e[4]);
+      res.mapTask = e[3].equals("m");
+      res.jobid = e[1] + "_" + e[2];
+      res.taskid = Integer.parseInt(e[4]);
+      res.execid = Integer.parseInt(e[5]);
     }
     return res;
   }