You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2016/08/05 22:37:25 UTC
oozie git commit: Additional patch fixing issues for OOZIE-1402
Repository: oozie
Updated Branches:
refs/heads/master eba0f0365 -> cdde957ac
Additional patch fixing issues for OOZIE-1402
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/cdde957a
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/cdde957a
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/cdde957a
Branch: refs/heads/master
Commit: cdde957ac97c6e17607c63184bf52d309289b347
Parents: eba0f03
Author: Rohini Palaniswamy <ro...@apache.org>
Authored: Fri Aug 5 15:37:24 2016 -0700
Committer: Rohini Palaniswamy <ro...@apache.org>
Committed: Fri Aug 5 15:37:24 2016 -0700
----------------------------------------------------------------------
.../command/coord/CoordActionInputCheckXCommand.java | 13 +++++++------
core/src/main/resources/oozie-default.xml | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/cdde957a/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
index c3f01d8..650e7f8 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
@@ -71,8 +71,8 @@ public class CoordActionInputCheckXCommand extends CoordinatorXCommand<Void> {
*/
public static final String CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL = Service.CONF_PREFIX
+ "coord.input.check.requeue.interval";
- public static final String CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL_INCREASE = Service.CONF_PREFIX
- + "coord.input.check.requeue.interval.increase";
+ public static final String CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL_ADDITIONAL_DELAY = Service.CONF_PREFIX
+ + "coord.input.check.requeue.interval.additional.delay";
private CoordinatorActionBean coordAction = null;
private CoordinatorJobBean coordJob = null;
private JPAService jpaService = null;
@@ -191,11 +191,12 @@ public class CoordActionInputCheckXCommand extends CoordinatorXCommand<Void> {
new CoordActionReadyXCommand(coordAction.getJobId()).call();
}
else if (!isTimeout(currentTime)) {
- if (status == false) {
- long increase = ConfigurationService.getInt(CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL_INCREASE)
- * 1000L;
+ if (!status) {
+ long addtionalDelay = isChangeInDependency ? 0
+ : ConfigurationService.getInt(CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL_ADDITIONAL_DELAY)
+ * 1000L;
queue(new CoordActionInputCheckXCommand(coordAction.getId(), coordAction.getJobId()),
- increase + getCoordInputCheckRequeueInterval());
+ addtionalDelay + getCoordInputCheckRequeueInterval());
}
updateCoordAction(coordAction, isChangeInDependency);
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/cdde957a/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 6a9d5c4..40a5fe5 100644
--- a/core/src/main/resources/oozie-default.xml
+++ b/core/src/main/resources/oozie-default.xml
@@ -546,7 +546,7 @@
</property>
<property>
- <name>oozie.service.coord.input.check.requeue.interval.increase</name>
+ <name>oozie.service.coord.input.check.requeue.interval.additional.delay</name>
<value>0</value>
<description>This value (in seconds) will be added into oozie.service.coord.input.check.requeue.interval and resulting value
will be the requeue interval for the actions which are waiting for a long time without any input.