You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ro...@apache.org on 2013/03/05 13:59:58 UTC

svn commit: r1452782 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java

Author: rohini
Date: Tue Mar  5 12:59:57 2013
New Revision: 1452782

URL: http://svn.apache.org/r1452782
Log:
PIG-3081: Pig progress stays at 0% for the first job in hadoop 23 (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1452782&r1=1452781&r2=1452782&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Mar  5 12:59:57 2013
@@ -129,6 +129,8 @@ PIG-3013: BinInterSedes improve chararra
 
 BUG FIXES
 
+PIG-3081: Pig progress stays at 0% for the first job in hadoop 23 (rohini)
+
 PIG-3150: e2e Scripting_5 fails in trunk (dreambird via cheolsoo)
 
 PIG-3153: TestScriptUDF.testJavascriptExampleScript fails in trunk (cheolsoo)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java?rev=1452782&r1=1452781&r2=1452782&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/MapReduceLauncher.java Tue Mar  5 12:59:57 2013
@@ -319,9 +319,10 @@ public class MapReduceLauncher extends L
             	jobsWithoutIds.removeAll(jobsAssignedIdInThisRun);
 
             	double prog = (numMRJobsCompl+calculateProgress(jc, jobClient))/totalMRJobs;
-            	notifyProgress(prog, lastProg);
-            	lastProg = prog;
-            	
+            	if (notifyProgress(prog, lastProg)) {
+                    lastProg = prog;
+                }
+
             	// collect job stats by frequently polling of completed jobs (PIG-1829)
             	PigStatsUtil.accumulateStats(jc);
             	
@@ -507,15 +508,16 @@ public class MapReduceLauncher extends L
      * @param prog current progress
      * @param lastProg progress last time
      */
-    private void notifyProgress(double prog, double lastProg) {
-        if(prog>=(lastProg+0.01)){
+    private boolean notifyProgress(double prog, double lastProg) {
+        if (prog >= (lastProg + 0.04)) {
             int perCom = (int)(prog * 100);
             if(perCom!=100) {
                 log.info( perCom + "% complete");
-                
                 ScriptState.get().emitProgressUpdatedNotification(perCom);
             }
-        }      
+            return true;
+        }
+        return false;
     }
 
     @Override