Repository: oozie Updated Branches: refs/heads/master daba7f4b2 -> de7e72413
OOZIE-1777 duplicated log message in Pig launcher's stdout (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c5566da3 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c5566da3 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c5566da3 Branch: refs/heads/master Commit: c5566da3741ba79fd8d2c38dd5b85ce877391f26 Parents: daba7f4 Author: egashira <[email protected]> Authored: Wed Apr 30 17:42:00 2014 -0700 Committer: egashira <[email protected]> Committed: Wed Apr 30 17:42:00 2014 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c5566da3/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 3c9ae84..32beb06 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1777 duplicated log message in Pig launcher's stdout (ryota) OOZIE-1748 When using cron-like syntax, the "Time Unit" field says "MINUTE" OOZIE-1737 Oozie log streaming is slow (puru via rohini) OOZIE-1794 java-opts and java-opt in the Java action don't always work properly in YARN (rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/c5566da3/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 7b16a8c..48820f7 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 @@ -170,6 +170,7 @@ public class PigMain extends LauncherMain { hadoopProps.load(log4jFile.openStream()); hadoopProps.setProperty("log4j.rootLogger", pigLogLevel + ", A, B"); hadoopProps.setProperty("log4j.logger.org.apache.pig", pigLogLevel + ", A, B"); + hadoopProps.setProperty("log4j.additivity.org.apache.pig", "false"); hadoopProps.setProperty("log4j.appender.A", "org.apache.log4j.ConsoleAppender"); hadoopProps.setProperty("log4j.appender.A.layout", "org.apache.log4j.PatternLayout"); hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n");
