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/05/30 21:31:17 UTC
svn commit: r1598709 - in /pig/trunk: CHANGES.txt
src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
src/org/apache/pig/backend/hadoop/executionengine/tez/util/MRToTezHelper.java
Author: rohini
Date: Fri May 30 19:31:16 2014
New Revision: 1598709
URL: http://svn.apache.org/r1598709
Log:
PIG-3971: Pig on tez fails to run in Oozie in secure cluster (rohini)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
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=1598709&r1=1598708&r2=1598709&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri May 30 19:31:16 2014
@@ -30,6 +30,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-3971: Pig on tez fails to run in Oozie in secure cluster (rohini)
+
PIG-3968: OperatorPlan.serialVersionUID is not defined (daijy)
Release 0.13.0 - Unreleased
Modified: pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java?rev=1598709&r1=1598708&r2=1598709&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java (original)
+++ pig/trunk/src/org/apache/pig/backend/hadoop/executionengine/tez/TezSessionManager.java Fri May 30 19:31:16 2014
@@ -102,10 +102,9 @@ public class TezSessionManager {
}
private static SessionInfo createSession(Configuration conf, Map<String, LocalResource> requestedAMResources, Credentials creds) throws TezException, IOException {
- TezConfiguration tezConf = new TezConfiguration(conf);
- AMConfiguration amConfig = getAMConfig(tezConf, requestedAMResources, creds);
+ AMConfiguration amConfig = getAMConfig(new TezConfiguration(conf), requestedAMResources, creds);
+ TezConfiguration tezConf = amConfig.getAMConf();
TezSessionConfiguration sessionConfig = new TezSessionConfiguration(amConfig, tezConf);
-
String jobName = conf.get(PigContext.JOB_NAME, "pig");
TezClient tezClient = new TezClient(tezConf);
ApplicationId appId = tezClient.createApplication();
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=1598709&r1=1598708&r2=1598709&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 Fri May 30 19:31:16 2014
@@ -132,6 +132,11 @@ public class MRToTezHelper {
+ dagAMConf.getInt(MRJobConfig.MR_AM_MAX_ATTEMPTS,
MRJobConfig.DEFAULT_MR_AM_MAX_ATTEMPTS));
+ if (tezConf.get("mapreduce.job.credentials.binary") != null) {
+ dagAMConf.setIfUnset(TezJobConfig.TEZ_CREDENTIALS_PATH,
+ tezConf.get("mapreduce.job.credentials.binary"));
+ }
+
return dagAMConf;
}