svn commit: r1515665 - in /oozie/branches/branch-4.0: core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java release-log.txt sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java

[rohini]

Author: rohini
Date: Mon Aug 19 23:36:03 2013
New Revision: 1515665

URL: http://svn.apache.org/r1515665
Log:
OOZIE-1501 Mapreduce action counters are picked up from launcher job instead of 
mapreduce job (rohini)

Modified:
    
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
    oozie/branches/branch-4.0/release-log.txt
    
oozie/branches/branch-4.0/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java

Modified: 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java?rev=1515665&r1=1515664&r2=1515665&view=diff
==============================================================================
--- 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
 (original)
+++ 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
 Mon Aug 19 23:36:03 2013
@@ -29,7 +29,6 @@ import org.apache.hadoop.mapred.JobClien
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.JobID;
 import org.apache.hadoop.mapred.RunningJob;
-import org.apache.oozie.WorkflowActionBean;
 import org.apache.oozie.action.ActionExecutorException;
 import org.apache.oozie.client.WorkflowAction;
 import org.apache.oozie.service.Services;
@@ -181,11 +180,11 @@ public class MapReduceActionExecutor ext
                 Element actionXml = XmlUtils.parseXml(action.getConf());
                 JobConf jobConf = createBaseHadoopConf(context, actionXml);
                 jobClient = createJobClient(context, jobConf);
-                RunningJob runningJob = 
jobClient.getJob(JobID.forName(action.getExternalId()));
+                RunningJob runningJob = 
jobClient.getJob(JobID.forName(action.getExternalChildIDs()));
                 if (runningJob == null) {
                     throw new 
ActionExecutorException(ActionExecutorException.ErrorType.FAILED, "MR002",
-                                                      "Unknown hadoop job 
[{0}] associated with action [{1}].  Failing this action!", action
-                            .getExternalId(), action.getId());
+                            "Unknown hadoop job [{0}] associated with action 
[{1}].  Failing this action!",
+                            action.getExternalChildIDs(), action.getId());
                 }
 
                 Counters counters = runningJob.getCounters();
@@ -207,7 +206,8 @@ public class MapReduceActionExecutor ext
                 }
                 else {
                     context.setVar(HADOOP_COUNTERS, "");
-                    XLog.getLog(getClass()).warn("Could not find Hadoop 
Counters for: [{0}]", action.getExternalId());
+                    XLog.getLog(getClass()).warn("Could not find Hadoop 
Counters for: [{0}]",
+                            action.getExternalChildIDs());
                 }
             }
         }

Modified: oozie/branches/branch-4.0/release-log.txt
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1515665&r1=1515664&r2=1515665&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Mon Aug 19 23:36:03 2013
@@ -1,5 +1,6 @@
 -- Oozie 4.0.0 release
 
+OOZIE-1501 Mapreduce action counters are picked up from launcher job instead 
of mapreduce job (rohini)
 OOZIE-1405 Fix flakey SLA tests (mona)
 OOZIE-1481 Getting a coordinator job info with len=0 should return 0 actions 
(rohini)
 OOZIE-1480 Web-console Workflow Job Info popup should display parent-id field 
and no empty Nominal time field (mona)

Modified: 
oozie/branches/branch-4.0/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1515665&r1=1515664&r2=1515665&view=diff
==============================================================================
--- 
oozie/branches/branch-4.0/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
 (original)
+++ 
oozie/branches/branch-4.0/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
 Mon Aug 19 23:36:03 2013
@@ -54,6 +54,7 @@ import java.util.Scanner;
 import java.util.jar.JarOutputStream;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
+
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.oozie.action.ActionExecutorException;
 
@@ -373,6 +374,7 @@ public class TestMapReduceActionExecutor
         assertNotNull(context.getVar("hadoop.counters"));
         String counters = context.getVar("hadoop.counters");
         assertTrue(counters.contains("Counter"));
+        assertTrue(counters.contains("\"MAP_OUTPUT_RECORDS\":2"));
 
         //External Child IDs used to be null, but after 4.0, become Non-Null 
in case of MR action.
         assertNotNull(context.getExternalChildIDs());