Repository: oozie
Updated Branches:
  refs/heads/master 06a2241c0 -> b1d79f050


OOZIE-1527 Fix scalability issues with coordinator materialization (puru via 
rohini)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b1d79f05
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b1d79f05
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b1d79f05

Branch: refs/heads/master
Commit: b1d79f050c247225cfc0d3d671497d236af8d08a
Parents: 06a2241
Author: Rohini Palaniswamy <[email protected]>
Authored: Mon Jun 23 16:19:58 2014 -0700
Committer: Rohini Palaniswamy <[email protected]>
Committed: Mon Jun 23 16:19:58 2014 -0700

----------------------------------------------------------------------
 .../org/apache/oozie/service/CoordMaterializeTriggerService.java  | 3 +--
 core/src/main/resources/oozie-default.xml                         | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/b1d79f05/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
 
b/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
index d2b5a6c..1dac7e8 100644
--- 
a/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
+++ 
b/core/src/main/java/org/apache/oozie/service/CoordMaterializeTriggerService.java
@@ -61,7 +61,6 @@ public class CoordMaterializeTriggerService implements 
Service {
     private static final String INSTRUMENTATION_GROUP = "coord_job_mat";
     private static final String INSTR_MAT_JOBS_COUNTER = "jobs";
     public static final int CONF_LOOKUP_INTERVAL_DEFAULT = 300;
-    private static final int CONF_SCHEDULING_INTERVAL_DEFAULT = 300;
     private static final int CONF_MATERIALIZATION_WINDOW_DEFAULT = 3600;
     private static final int CONF_MATERIALIZATION_SYSTEM_LIMIT_DEFAULT = 50;
 
@@ -210,7 +209,7 @@ public class CoordMaterializeTriggerService implements 
Service {
         // default is 300sec (5min)
         int lookupInterval = 
Services.get().getConf().getInt(CONF_LOOKUP_INTERVAL, 
CONF_LOOKUP_INTERVAL_DEFAULT);
         // default is 300sec (5min)
-        int schedulingInterval = 
Services.get().getConf().getInt(CONF_SCHEDULING_INTERVAL, 
CONF_SCHEDULING_INTERVAL_DEFAULT);
+        int schedulingInterval = 
Services.get().getConf().getInt(CONF_SCHEDULING_INTERVAL, lookupInterval);
 
         Runnable lookupTriggerJobsRunnable = new 
CoordMaterializeTriggerRunnable(materializationWindow, lookupInterval);
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/b1d79f05/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 4dedeef..61ac388 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -417,12 +417,15 @@
         </description>
     </property>
 
+    <!-- Enable this if you want different scheduling interval for 
CoordMaterializeTriggerService.
+    By default it will use lookup interval as scheduling interval
     <property>
         <name>oozie.service.CoordMaterializeTriggerService.scheduling.interval
         </name>
         <value>300</value>
         <description> The frequency at which the 
CoordMaterializeTriggerService will run.</description>
     </property>
+    -->
 
     <property>
         
<name>oozie.service.CoordMaterializeTriggerService.materialization.window

Reply via email to