Repository: oozie Updated Branches: refs/heads/master 58dadced8 -> 9ad5416cc
OOZIE-2026 fix synchronization in SLACalculatorMemory.addJobStatus to avoid duplicated SLA message (ryota) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9ad5416c Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9ad5416c Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9ad5416c Branch: refs/heads/master Commit: 9ad5416cca7f36247bfd9ae1b9aed33c4661adda Parents: 58dadce Author: egashira <[email protected]> Authored: Fri Oct 10 02:42:14 2014 -0700 Committer: egashira <[email protected]> Committed: Fri Oct 10 02:42:14 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/sla/SLACalculatorMemory.java | 12 ++++++------ release-log.txt | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9ad5416c/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java b/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java index cdf8b73..188144e 100644 --- a/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java +++ b/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java @@ -728,6 +728,9 @@ public class SLACalculatorMemory implements SLACalculator { } slaInfo.setEventProcessed(8); historySet.remove(jobId); + slaInfo.setLastModifiedTime(new Date()); + SLASummaryQueryExecutor.getInstance().executeUpdate( + SLASummaryQuery.UPDATE_SLA_SUMMARY_FOR_STATUS_ACTUAL_TIMES, slaInfo); hasSla = true; } else if (Services.get().get(JobsConcurrencyService.class).isHighlyAvailableMode()) { @@ -773,11 +776,13 @@ public class SLACalculatorMemory implements SLACalculator { LOG.debug("Unknown Job Status for SLA purpose[{0}]", jobEventStatus); slaInfo = getSLASummaryBean(slaCalc); } - if (slaCalc.getEventProcessed() == 7) { slaInfo.setEventProcessed(8); slaMap.remove(jobId); } + slaInfo.setLastModifiedTime(new Date()); + SLASummaryQueryExecutor.getInstance().executeUpdate( + SLASummaryQuery.UPDATE_SLA_SUMMARY_FOR_STATUS_ACTUAL_TIMES, slaInfo); hasSla = true; } } @@ -791,11 +796,6 @@ public class SLACalculatorMemory implements SLACalculator { LOG.trace("SLA Status Event - Job:" + jobId + " Status:" + slaCalc.getSLAStatus()); } - if (hasSla) { - slaInfo.setLastModifiedTime(new Date()); - SLASummaryQueryExecutor.getInstance().executeUpdate( - SLASummaryQuery.UPDATE_SLA_SUMMARY_FOR_STATUS_ACTUAL_TIMES, slaInfo); - } return hasSla; } http://git-wip-us.apache.org/repos/asf/oozie/blob/9ad5416c/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 42c4f69..6d43c99 100644 --- a/release-log.txt +++ b/release-log.txt @@ -30,6 +30,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang) -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-2026 fix synchronization in SLACalculatorMemory.addJobStatus to avoid duplicated SLA message (ryota) OOZIE-2017 On startup, StatusTransitService can transition Coordinators that were in PREPSUSPENDED to RUNNING (rkanter) OOZIE-1932 Services should load CallableQueueService after MemoryLocksService (mona) OOZIE-1997 Oozie cannot materialize coordinator job with sqlserver in windows (bzhang)
