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 2014/10/12 04:58:46 UTC

svn commit: r1631143 - in /pig/trunk: CHANGES.txt src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java

Author: rohini
Date: Sun Oct 12 02:58:45 2014
New Revision: 1631143

URL: http://svn.apache.org/r1631143
Log:
PIG-4199: Mapreduce ACLs should be translated to Tez ACLs (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1631143&r1=1631142&r2=1631143&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sun Oct 12 02:58:45 2014
@@ -26,7 +26,6 @@ IMPROVEMENTS
  
 BUG FIXES
 
-PIG-4227: Streaming Python UDF handles bag outputs incorrectly (cheolsoo)
 
 
 Release 0.14.0 - Unreleased
@@ -95,6 +94,10 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-4199: Mapreduce ACLs should be translated to Tez ACLs (rohini)
+
+PIG-4227: Streaming Python UDF handles bag outputs incorrectly (cheolsoo)
+
 PIG-4219: When parsing a schema, pig drops tuple inside of Bag if it contains only one field (lbendig via daijy)
 
 PIG-4226: Upgrade Tez to 0.5.1 (daijy)

Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java?rev=1631143&r1=1631142&r2=1631143&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java Sun Oct 12 02:58:45 2014
@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.JobContext;
+import org.apache.hadoop.mapreduce.MRJobConfig;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
@@ -35,7 +36,6 @@ import org.apache.pig.backend.hadoop.exe
 import org.apache.pig.classification.InterfaceAudience;
 import org.apache.tez.dag.api.TezConfiguration;
 import org.apache.tez.mapreduce.hadoop.DeprecatedKeys;
-import org.apache.tez.mapreduce.hadoop.MRJobConfig;
 
 @InterfaceAudience.Private
 public class MRToTezHelper {
@@ -117,6 +117,12 @@ public class MRToTezHelper {
         dagAMConf.setIfUnset(TezConfiguration.TEZ_AM_RESOURCE_CPU_VCORES, ""
                 + amCores);
 
+        dagAMConf.setIfUnset(TezConfiguration.TEZ_AM_VIEW_ACLS,
+                tezConf.get(MRJobConfig.JOB_ACL_VIEW_JOB, MRJobConfig.DEFAULT_JOB_ACL_VIEW_JOB));
+
+        dagAMConf.setIfUnset(TezConfiguration.TEZ_AM_MODIFY_ACLS,
+                tezConf.get(MRJobConfig.JOB_ACL_MODIFY_JOB, MRJobConfig.DEFAULT_JOB_ACL_MODIFY_JOB));
+
         dagAMConf.setIfUnset(TezConfiguration.TEZ_AM_MAX_APP_ATTEMPTS, ""
                 + dagAMConf.getInt(MRJobConfig.MR_AM_MAX_ATTEMPTS,
                         MRJobConfig.DEFAULT_MR_AM_MAX_ATTEMPTS));