pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From roh...@apache.org
Subject svn commit: r1601019 - in /pig/trunk: ./ shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/ shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/ src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/
Date Fri, 06 Jun 2014 21:51:33 GMT
Author: rohini
Date: Fri Jun  6 21:51:33 2014
New Revision: 1601019

URL: http://svn.apache.org/r1601019
Log:
PIG-2409: Pig show wrong tracking URL for hadoop 2 (lbendig via rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
    pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
    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=1601019&r1=1601018&r2=1601019&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jun  6 21:51:33 2014
@@ -30,6 +30,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-2409: Pig show wrong tracking URL for hadoop 2 (lbendig via rohini)
+
 PIG-3978: Container reuse does not across PigServer (daijy)
 
 PIG-3974: E2E test data generation fails in cluster mode (lbendig via cheolsoo)

Modified: pig/trunk/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/pig/trunk/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java?rev=1601019&r1=1601018&r2=1601019&view=diff
==============================================================================
--- pig/trunk/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
(original)
+++ pig/trunk/shims/src/hadoop20/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
Fri Jun  6 21:51:33 2014
@@ -183,4 +183,8 @@ public class HadoopShims {
                 ? jobClient.getMapTaskReports(job.getAssignedJobID())
                         : jobClient.getReduceTaskReports(job.getAssignedJobID());
     }
+    
+    public static boolean isHadoopYARN() {
+        return false;
+    }
 }

Modified: pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
URL: http://svn.apache.org/viewvc/pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java?rev=1601019&r1=1601018&r2=1601019&view=diff
==============================================================================
--- pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
(original)
+++ pig/trunk/shims/src/hadoop23/org/apache/pig/backend/hadoop/executionengine/shims/HadoopShims.java
Fri Jun  6 21:51:33 2014
@@ -221,4 +221,8 @@ public class HadoopShims {
             throw new IOException(ir);
         }
     }
+    
+    public static boolean isHadoopYARN() {
+        return true;
+    }
 }

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=1601019&r1=1601018&r2=1601019&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
Fri Jun  6 21:51:33 2014
@@ -49,7 +49,6 @@ import org.apache.pig.PigWarning;
 import org.apache.pig.backend.BackendException;
 import org.apache.pig.backend.executionengine.ExecException;
 import org.apache.pig.backend.hadoop.datastorage.ConfigurationUtil;
-import org.apache.pig.backend.hadoop.executionengine.JobCreationException;
 import org.apache.pig.backend.hadoop.executionengine.HExecutionEngine;
 import org.apache.pig.backend.hadoop.executionengine.JobCreationException;
 import org.apache.pig.backend.hadoop.executionengine.Launcher;
@@ -325,10 +324,9 @@ public class MapReduceLauncher extends L
                                 log.info("detailed locations: " + aliasLocation);
                             }
 
-
-                            if(jobTrackerLoc != null){
-                                log.info("More information at: http://"+ jobTrackerLoc+
-                                        "/jobdetails.jsp?jobid="+job.getAssignedJobID());
+                            if (!HadoopShims.isHadoopYARN() && jobTrackerLoc != null)
{
+                                log.info("More information at: http://" + jobTrackerLoc
+                                        + "/jobdetails.jsp?jobid=" + job.getAssignedJobID());
                             }
 
                             // update statistics for this job so jobId is set



Mime
View raw message