Repository: oozie Updated Branches: refs/heads/master 817d81971 -> 9ca2aa4f2
amend OOZIE-2430 Add root logger for hive,sqoop action Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9ca2aa4f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9ca2aa4f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9ca2aa4f Branch: refs/heads/master Commit: 9ca2aa4f21fa68ff34a9b1a52c5ac8a177b5a9a4 Parents: 817d819 Author: Purshotam Shah <[email protected]> Authored: Tue Jul 26 09:55:06 2016 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue Jul 26 09:55:06 2016 -0700 ---------------------------------------------------------------------- .../org/apache/oozie/action/hadoop/JavaActionExecutor.java | 2 +- .../main/java/org/apache/oozie/action/hadoop/HiveMain.java | 9 +++++++-- .../main/java/org/apache/oozie/action/hadoop/PigMain.java | 2 +- .../org/apache/oozie/action/hadoop/PigMainWithOldAPI.java | 4 ++-- .../main/java/org/apache/oozie/action/hadoop/SqoopMain.java | 5 +++-- 5 files changed, 14 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9ca2aa4f/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index f2273d6..e2e0510 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -45,7 +45,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.AccessControlException; -import org.apache.hadoop.hive.shims.HadoopShims; +import org.apache.oozie.hadoop.utils.HadoopShims; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; http://git-wip-us.apache.org/repos/asf/oozie/blob/9ca2aa4f/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java index cb0172d..d8ce232 100644 --- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java +++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java @@ -147,18 +147,23 @@ public class HiveMain extends LauncherMain { hadoopProps.setProperty("log4j.rootLogger", rootLogLevel + ", A"); hadoopProps.setProperty("log4j.logger.org.apache.hadoop.hive", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.org.apache.hadoop.hive", "false"); hadoopProps.setProperty("log4j.logger.hive", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.hive", "false"); hadoopProps.setProperty("log4j.logger.DataNucleus", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.DataNucleus", "false"); hadoopProps.setProperty("log4j.logger.DataStore", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.DataStore", "false"); hadoopProps.setProperty("log4j.logger.JPOX", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.JPOX", "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", "%-4r [%t] -5p %c %x - %m%n"); + hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); hadoopProps.setProperty("log4j.appender.jobid", "org.apache.log4j.FileAppender"); 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.appender.jobid.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); hadoopProps.setProperty("log4j.logger.org.apache.hadoop.hive.ql.exec", "INFO, jobid"); hadoopProps.setProperty("log4j.logger.SessionState", "INFO, jobid"); http://git-wip-us.apache.org/repos/asf/oozie/blob/9ca2aa4f/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 7ba22f1..eaab1fe 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 @@ -165,7 +165,7 @@ public class PigMain extends LauncherMain { if (log4jFile != null) { String pigLogLevel = actionConf.get("oozie.pig.log.level", "INFO"); - String rootLogLevel = actionConf.get("oozie.action ." + LauncherMapper.ROOT_LOGGER_LEVEL, "INFO"); + String rootLogLevel = actionConf.get("oozie.action." + LauncherMapper.ROOT_LOGGER_LEVEL, "INFO"); // append required PIG properties to the default hadoop log4j file Properties hadoopProps = new Properties(); http://git-wip-us.apache.org/repos/asf/oozie/blob/9ca2aa4f/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java ---------------------------------------------------------------------- diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java index 7ff125d..a5291d9 100644 --- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java +++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMainWithOldAPI.java @@ -162,11 +162,11 @@ public class PigMainWithOldAPI extends LauncherMain { hadoopProps.setProperty("log4j.logger.org.apache.pig", pigLogLevel + ", A, B"); 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", "%-4r [%t] %-5p %c %x - %m%n"); + hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); hadoopProps.setProperty("log4j.appender.B", "org.apache.log4j.FileAppender"); hadoopProps.setProperty("log4j.appender.B.file", logFile); hadoopProps.setProperty("log4j.appender.B.layout", "org.apache.log4j.PatternLayout"); - hadoopProps.setProperty("log4j.appender.B.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n"); + hadoopProps.setProperty("log4j.appender.B.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); String localProps = new File("piglog4j.properties").getAbsolutePath(); OutputStream os1 = new FileOutputStream(localProps); http://git-wip-us.apache.org/repos/asf/oozie/blob/9ca2aa4f/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 360cf1e..b0c7635 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 @@ -124,14 +124,15 @@ public class SqoopMain extends LauncherMain { hadoopProps.setProperty("log4j.rootLogger", rootLogLevel + ", A"); hadoopProps.setProperty("log4j.logger.org.apache.sqoop", logLevel + ", A"); + hadoopProps.setProperty("log4j.additivity.org.apache.sqoop", "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", "%-4r [%t] %-5p %c %x - %m%n"); + hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); hadoopProps.setProperty("log4j.appender.jobid", "org.apache.log4j.FileAppender"); 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.appender.jobid.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n"); hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapred", "INFO, jobid, A"); hadoopProps.setProperty("log4j.logger.org.apache.hadoop.mapreduce.Job", "INFO, jobid, A");
