You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ry...@apache.org on 2014/05/01 02:47:05 UTC
[1/2] git commit: OOZIE-1777 duplicated log message in Pig launcher's
stdout (ryota)
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 <ry...@yahoo.com>
Authored: Wed Apr 30 17:42:00 2014 -0700
Committer: egashira <ry...@yahoo.com>
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");
[2/2] git commit: OOZIE-1787 parameterize interval of SLAService
updating SlaStatus (ryota)
Posted by ry...@apache.org.
OOZIE-1787 parameterize interval of SLAService updating SlaStatus (ryota)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/de7e7241
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/de7e7241
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/de7e7241
Branch: refs/heads/master
Commit: de7e72413b019ff8733ccf79f797905b40730e3f
Parents: c5566da
Author: egashira <ry...@yahoo.com>
Authored: Wed Apr 30 17:43:37 2014 -0700
Committer: egashira <ry...@yahoo.com>
Committed: Wed Apr 30 17:43:37 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/oozie/sla/service/SLAService.java | 5 ++++-
core/src/main/resources/oozie-default.xml | 8 ++++++++
release-log.txt | 1 +
3 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/de7e7241/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/sla/service/SLAService.java b/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
index 2458e69..ea2983f 100644
--- a/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
+++ b/core/src/main/java/org/apache/oozie/sla/service/SLAService.java
@@ -41,6 +41,8 @@ public class SLAService implements Service {
public static final String CONF_ALERT_EVENTS = CONF_PREFIX + "alert.events";
public static final String CONF_EVENTS_MODIFIED_AFTER = CONF_PREFIX + "events.modified.after";
public static final String CONF_JOB_EVENT_LATENCY = CONF_PREFIX + "job.event.latency";
+ //Time interval, in seconds, at which SLA Worker will be scheduled to run
+ public static final String CONF_SLA_CHECK_INTERVAL = CONF_PREFIX + "check.interval";
private static SLACalculator calcImpl;
private static boolean slaEnabled = false;
@@ -66,7 +68,8 @@ public class SLAService implements Service {
Runnable slaThread = new SLAWorker(calcImpl);
// schedule runnable by default every 30 sec
- services.get(SchedulerService.class).schedule(slaThread, 10, 30, SchedulerService.Unit.SEC);
+ int slaCheckInterval = services.getConf().getInt(CONF_SLA_CHECK_INTERVAL, 30);
+ services.get(SchedulerService.class).schedule(slaThread, 10, slaCheckInterval, SchedulerService.Unit.SEC);
slaEnabled = true;
LOG.info("SLAService initialized with impl [{0}] capacity [{1}]", calcImpl.getClass().getName(),
conf.get(SLAService.CONF_CAPACITY));
http://git-wip-us.apache.org/repos/asf/oozie/blob/de7e7241/core/src/main/resources/oozie-default.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-default.xml b/core/src/main/resources/oozie-default.xml
index 7ea0d7b..c35d090 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -2002,6 +2002,14 @@
</description>
</property>
+ <property>
+ <name>oozie.sla.service.SLAService.check.interval</name>
+ <value>30</value>
+ <description>
+ Time interval, in seconds, at which SLA Worker will be scheduled to run
+ </description>
+ </property>
+
<!-- ZooKeeper configuration -->
<property>
<name>oozie.zookeeper.connection.string</name>
http://git-wip-us.apache.org/repos/asf/oozie/blob/de7e7241/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 32beb06..eb9e40c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1787 parameterize interval of SLAService updating SlaStatus (ryota)
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)