Repository: oozie Updated Branches: refs/heads/master a6ed8d77a -> c715efdc0
OOZIE-1402 Increase retry interval for non-progressing coordinator action with fix value Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c715efdc Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c715efdc Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c715efdc Branch: refs/heads/master Commit: c715efdc04e1aa5378f414a13e6143c31fa32985 Parents: a6ed8d7 Author: Purshotam Shah <[email protected]> Authored: Tue May 10 09:59:31 2016 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue May 10 09:59:31 2016 -0700 ---------------------------------------------------------------------- .../oozie/command/coord/CoordActionInputCheckXCommand.java | 7 +++++-- core/src/main/resources/oozie-default.xml | 8 ++++++++ release-log.txt | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c715efdc/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 640d3cb..c3f01d8 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,11 +71,12 @@ 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"; private CoordinatorActionBean coordAction = null; private CoordinatorJobBean coordJob = null; private JPAService jpaService = null; private String jobId = null; - public CoordActionInputCheckXCommand(String actionId, String jobId) { super("coord_action_input", "coord_action_input", 1); this.actionId = ParamChecker.notEmpty(actionId, "actionId"); @@ -191,8 +192,10 @@ public class CoordActionInputCheckXCommand extends CoordinatorXCommand<Void> { } else if (!isTimeout(currentTime)) { if (status == false) { + long increase = ConfigurationService.getInt(CONF_COORD_INPUT_CHECK_REQUEUE_INTERVAL_INCREASE) + * 1000L; queue(new CoordActionInputCheckXCommand(coordAction.getId(), coordAction.getJobId()), - getCoordInputCheckRequeueInterval()); + increase + getCoordInputCheckRequeueInterval()); } updateCoordAction(coordAction, isChangeInDependency); } http://git-wip-us.apache.org/repos/asf/oozie/blob/c715efdc/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 d2360fc..c85234c 100644 --- a/core/src/main/resources/oozie-default.xml +++ b/core/src/main/resources/oozie-default.xml @@ -538,6 +538,14 @@ </property> <property> + <name>oozie.service.coord.input.check.requeue.interval.increase</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. + </description> + </property> + + <property> <name>oozie.service.coord.push.check.requeue.interval </name> <value>600000</value> http://git-wip-us.apache.org/repos/asf/oozie/blob/c715efdc/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 035bc12..efd0108 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-1402 Increase retry interval for non-progressing coordinator action with fix value (satishsaley via puru) OOZIE-2512 ShareLibservice returns incorrect path for jar (satishsaley via puru) OOZIE-2471 Show child job url tab for distcp (satishsaley via puru) OOZIE-2511 SubWorkflow missing variable set from option if config-default is present in parent workflow (asasvari via rkanter)
