Repository: oozie Updated Branches: refs/heads/master a5c559cb1 -> fe2e9d2ef
OOZIE-2537 SqoopMain does not set up log4j properly (pbacsko via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/fe2e9d2e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/fe2e9d2e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/fe2e9d2e Branch: refs/heads/master Commit: fe2e9d2ef87fc3ec31d5ee0b1b494896285639c8 Parents: a5c559c Author: Robert Kanter <[email protected]> Authored: Wed May 25 16:21:16 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Wed May 25 16:21:16 2016 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/fe2e9d2e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index ebd13ae..0d4282f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2537 SqoopMain does not set up log4j properly (pbacsko via rkanter) OOZIE-2532 patch apply does not handle binary files (gezapeti via rkanter) OOZIE-2330 Spark action should take the global jobTracker and nameNode configs by default and allow file and archive elements (satishsaley via rkanter) OOZIE-2510 TestLogStreamer.testStreamLog() fails in other timezones (pbacsko via rkanter) http://git-wip-us.apache.org/repos/asf/oozie/blob/fe2e9d2e/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java ---------------------------------------------------------------------- diff --git a/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java b/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java index 59a0209..360cf1e 100644 --- a/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java +++ b/sharelib/sqoop/src/main/java/org/apache/oozie/action/hadoop/SqoopMain.java @@ -132,8 +132,8 @@ public class SqoopMain extends LauncherMain { hadoopProps.setProperty("log4j.appender.jobid.file", logFile); hadoopProps.setProperty("log4j.appender.jobid.layout", "org.apache.log4j.PatternLayout"); hadoopProps.setProperty("log4j.appender.jobid.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n"); - hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapred", "INFO, jobid"); - hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapreduce.Job", "INFO, jobid"); + hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapred", "INFO, jobid, A"); + hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapreduce.Job", "INFO, jobid, A"); String localProps = new File(SQOOP_LOG4J_PROPS).getAbsolutePath(); OutputStream os1 = new FileOutputStream(localProps);
