Repository: oozie Updated Branches: refs/heads/master 999fbcdcb -> d1841c5b1
OOZIE-2257 BundleStatusTransitXCommand doesn't update last modified time Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d1841c5b Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d1841c5b Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d1841c5b Branch: refs/heads/master Commit: d1841c5b16ad991672fa36ef43055e1be6567e20 Parents: 999fbcd Author: Purshotam Shah <[email protected]> Authored: Fri Jun 12 10:19:43 2015 -0700 Committer: Purshotam Shah <[email protected]> Committed: Fri Jun 12 10:19:43 2015 -0700 ---------------------------------------------------------------------- .../oozie/command/bundle/BundleStatusTransitXCommand.java | 9 +++++---- .../oozie/command/coord/CoordStatusTransitXCommand.java | 6 +++--- release-log.txt | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/d1841c5b/core/src/main/java/org/apache/oozie/command/bundle/BundleStatusTransitXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/bundle/BundleStatusTransitXCommand.java b/core/src/main/java/org/apache/oozie/command/bundle/BundleStatusTransitXCommand.java index 953e899..fb45eb4 100644 --- a/core/src/main/java/org/apache/oozie/command/bundle/BundleStatusTransitXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/bundle/BundleStatusTransitXCommand.java @@ -72,7 +72,7 @@ public class BundleStatusTransitXCommand extends StatusTransitXCommand { for (BundleActionBean bAction : bundleActions) { int counter = 0; if (bundleActionStatus.containsKey(bAction.getStatus())) { - counter = bundleActionStatus.get(bAction.getStatus()) + 1; + counter = getActionStatusCount(bAction.getStatus()) + 1; } else { ++counter; @@ -224,6 +224,7 @@ public class BundleStatusTransitXCommand extends StatusTransitXCommand { // Check for backward support when RUNNINGWITHERROR, SUSPENDEDWITHERROR and // PAUSEDWITHERROR is not supported bundleJob.setStatus(StatusUtils.getStatusIfBackwardSupportTrue(bundleStatus)); + bundleJob.setLastModifiedTime(new Date()); if (foundPending) { bundleJob.setPending(); LOG.info("Bundle job [" + jobId + "] Pending set to TRUE"); @@ -244,7 +245,7 @@ public class BundleStatusTransitXCommand extends StatusTransitXCommand { private Job.Status getBottomUpPauseStatus() { if (bundleActionStatus.containsKey(Job.Status.PAUSED) - && bundleActions.size() == bundleActionStatus.get(Job.Status.PAUSED)) { + && bundleActions.size() == getActionStatusCount(Job.Status.PAUSED)) { return Job.Status.PAUSED; } @@ -272,7 +273,7 @@ public class BundleStatusTransitXCommand extends StatusTransitXCommand { return Job.Status.SUSPENDED; } else if (bundleActions.size() == getActionStatusCount(Job.Status.SUSPENDEDWITHERROR) - + bundleActionStatus.get(Job.Status.SUSPENDED) + getActionStatusCount(Job.Status.SUCCEEDED) + + getActionStatusCount(Job.Status.SUSPENDED) + getActionStatusCount(Job.Status.SUCCEEDED) + getActionStatusCount(Job.Status.KILLED) + getActionStatusCount(Job.Status.FAILED) + getActionStatusCount(Job.Status.DONEWITHERROR)) { return Job.Status.SUSPENDEDWITHERROR; @@ -290,7 +291,7 @@ public class BundleStatusTransitXCommand extends StatusTransitXCommand { private boolean isPrepRunningState() { return !foundPending && bundleActionStatus.containsKey(Job.Status.PREP) - && bundleActions.size() > bundleActionStatus.get(Job.Status.PREP); + && bundleActions.size() > getActionStatusCount(Job.Status.PREP); } private Status getPrepRunningStatus() { http://git-wip-us.apache.org/repos/asf/oozie/blob/d1841c5b/core/src/main/java/org/apache/oozie/command/coord/CoordStatusTransitXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/command/coord/CoordStatusTransitXCommand.java b/core/src/main/java/org/apache/oozie/command/coord/CoordStatusTransitXCommand.java index ffc5c44..ab8aa83 100644 --- a/core/src/main/java/org/apache/oozie/command/coord/CoordStatusTransitXCommand.java +++ b/core/src/main/java/org/apache/oozie/command/coord/CoordStatusTransitXCommand.java @@ -86,7 +86,7 @@ public class CoordStatusTransitXCommand extends StatusTransitXCommand { for (CoordinatorAction coordAction : coordActionStatusList) { int counter = 0; if (coordActionStatus.containsKey(coordAction.getStatus())) { - counter = coordActionStatus.get(coordAction.getStatus()) + 1; + counter = getStatusCount(coordAction.getStatus()) + 1; } else { ++counter; @@ -261,12 +261,12 @@ public class CoordStatusTransitXCommand extends StatusTransitXCommand { if (coordJob.isDoneMaterialization() && !isPending && coordActionStatus.containsKey(CoordinatorAction.Status.SUSPENDED)) { - if (coordActionCount == coordActionStatus.get(CoordinatorAction.Status.SUSPENDED) + if (coordActionCount == getStatusCount(CoordinatorAction.Status.SUSPENDED) + getStatusCount(CoordinatorAction.Status.SUCCEEDED)) { return Job.Status.SUSPENDED; } - else if (coordActionCount == coordActionStatus.get(CoordinatorAction.Status.SUSPENDED) + else if (coordActionCount == getStatusCount(CoordinatorAction.Status.SUSPENDED) + getStatusCount(CoordinatorAction.Status.SUCCEEDED) + getStatusCount(CoordinatorAction.Status.KILLED) + getStatusCount(CoordinatorAction.Status.FAILED) + getStatusCount(CoordinatorAction.Status.TIMEDOUT)) { http://git-wip-us.apache.org/repos/asf/oozie/blob/d1841c5b/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 78c6494..93b537f 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,7 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2257 BundleStatusTransitXCommand doesn't update last modified time (puru) + -- Oozie 4.2.0 release (unreleased) OOZIE-2260 Only set "java.io.tmpdir" to "./tmp" for the AM (ryota)
