Repository: oozie Updated Branches: refs/heads/master 90257ad8e -> e0ada0ab7
amendments patch to OOZIE-2348 Recovery service keeps on recovering coord action of suspended jobs Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/e0ada0ab Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/e0ada0ab Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/e0ada0ab Branch: refs/heads/master Commit: e0ada0ab7c5d0747d5fdb7b262d90a59a88f5d20 Parents: 90257ad Author: Purshotam Shah <[email protected]> Authored: Tue Sep 15 10:02:25 2015 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue Sep 15 10:02:25 2015 -0700 ---------------------------------------------------------------------- .../oozie/command/coord/CoordActionInputCheckXCommand.java | 4 ++-- .../oozie/command/coord/CoordPushDependencyCheckXCommand.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/e0ada0ab/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 a975f6e..179dfbf 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 @@ -138,8 +138,8 @@ public class CoordActionInputCheckXCommand extends CoordinatorXCommand<Void> { Date nominalTime = coordAction.getNominalTime(); Date currentTime = new Date(); if (nominalTime.compareTo(currentTime) > 0) { - queue(new CoordActionInputCheckXCommand(coordAction.getId(), coordAction.getJobId()), Math.max((nominalTime.getTime() - currentTime - .getTime()), getCoordInputCheckRequeueInterval())); + queue(new CoordActionInputCheckXCommand(coordAction.getId(), coordAction.getJobId()), nominalTime.getTime() + - currentTime.getTime()); updateCoordAction(coordAction, false); LOG.info("[" + actionId + "]::ActionInputCheck:: nominal Time is newer than current time, so requeue and wait. Current=" http://git-wip-us.apache.org/repos/asf/oozie/blob/e0ada0ab/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java index fbb2c6c..b05344d 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordPushDependencyCheckXCommand.java @@ -105,8 +105,7 @@ public class CoordPushDependencyCheckXCommand extends CoordinatorXCommand<Void> Date nominalTime = coordAction.getNominalTime(); Date currentTime = new Date(); if (nominalTime.compareTo(currentTime) > 0) { - queue(new CoordPushDependencyCheckXCommand(coordAction.getId()), Math.max((nominalTime.getTime() - currentTime - .getTime()), getCoordPushCheckRequeueInterval())); + queue(new CoordPushDependencyCheckXCommand(coordAction.getId(), true), nominalTime.getTime() - currentTime.getTime()); updateCoordAction(coordAction, false); LOG.info("[" + actionId + "]::CoordPushDependency:: nominal Time is newer than current time, so requeue and wait. Current="
