You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2014/06/11 20:37:46 UTC
git commit: OOZIE-1861 Pig action should work with tez mode (rohini)
Repository: oozie
Updated Branches:
refs/heads/master 11c665998 -> b7f6cc319
OOZIE-1861 Pig action should work with tez mode (rohini)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b7f6cc31
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b7f6cc31
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b7f6cc31
Branch: refs/heads/master
Commit: b7f6cc319b842347e775fd53316e8c3a09445037
Parents: 11c6659
Author: Rohini Palaniswamy <ro...@apache.org>
Authored: Wed Jun 11 11:37:41 2014 -0700
Committer: Rohini Palaniswamy <ro...@apache.org>
Committed: Wed Jun 11 11:37:41 2014 -0700
----------------------------------------------------------------------
release-log.txt | 1 +
.../pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/b7f6cc31/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 5090b5d..08ecebe 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1861 Pig action should work with tez mode (rohini)
OOZIE-1703 User should be able to set coord end-time before start time (puru via rohini)
OOZIE-1715 Distributed ID sequence for HA (puru via rkanter)
OOZIE-1870 Workflow action doen't resolve retry-max and retry-interval (puru via rohini)
http://git-wip-us.apache.org/repos/asf/oozie/blob/b7f6cc31/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
----------------------------------------------------------------------
diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
index 48820f7..382e8b9 100644
--- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
+++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
@@ -67,8 +67,6 @@ public class PigMain extends LauncherMain {
DISALLOWED_PIG_OPTIONS.add("-logfile");
DISALLOWED_PIG_OPTIONS.add("-r");
DISALLOWED_PIG_OPTIONS.add("-dryrun");
- DISALLOWED_PIG_OPTIONS.add("-x");
- DISALLOWED_PIG_OPTIONS.add("-exectype");
DISALLOWED_PIG_OPTIONS.add("-P");
DISALLOWED_PIG_OPTIONS.add("-propertyFile");
}
@@ -106,6 +104,7 @@ public class PigMain extends LauncherMain {
String jobTokenFile = getFilePathFromEnv("HADOOP_TOKEN_FILE_LOCATION");
if (jobTokenFile != null) {
pigProperties.setProperty("mapreduce.job.credentials.binary", jobTokenFile);
+ pigProperties.setProperty("tez.credentials.path", jobTokenFile);
System.out.println("------------------------");
System.out.println("Setting env property for mapreduce.job.credentials.binary to:"
+ jobTokenFile);