You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2014/08/29 00:59:15 UTC
git commit: OOZIE-1984 SLACalculator in HA mode performs duplicate
operations on records with completed jobs(mona)
Repository: oozie
Updated Branches:
refs/heads/master 55d98f80d -> cbcc64b33
OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs(mona)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/cbcc64b3
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/cbcc64b3
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/cbcc64b3
Branch: refs/heads/master
Commit: cbcc64b334bde6f361ccfb78185452a1acbf9dc8
Parents: 55d98f8
Author: mona <ch...@yahoo-inc.com>
Authored: Thu Aug 28 15:59:07 2014 -0700
Committer: mona <ch...@yahoo-inc.com>
Committed: Thu Aug 28 15:59:07 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java | 4 ++--
release-log.txt | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/cbcc64b3/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 3801325..a96e55d 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
@@ -737,8 +737,8 @@ public class SLACalculatorMemory implements SLACalculator {
// but not actually configured for SLA
SLASummaryBean slaSummaryBean = SLASummaryQueryExecutor.getInstance().get(
SLASummaryQuery.GET_SLA_SUMMARY, jobId);
- slaCalc = new SLACalcStatus(slaSummaryBean, slaRegBean);
- if (slaCalc.getEventProcessed() < 7) {
+ if (slaSummaryBean.getEventProcessed() < 7) {
+ slaCalc = new SLACalcStatus(slaSummaryBean, slaRegBean);
slaMap.put(jobId, slaCalc);
}
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/cbcc64b3/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 0b7eeb0..c87db1f 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -8,6 +8,7 @@ OOZIE-1943 Bump up trunk to 4.2.0-SNAPSHOT (bzhang)
-- Oozie 4.1.0 release (4.1 - unreleased)
+OOZIE-1984 SLACalculator in HA mode performs duplicate operations on records with completed jobs (mona)
OOZIE-1958 address duplication of env variables in oozie.launcher.yarn.app.mapreduce.am.env when running with uber mode (ryota)
OOZIE-1920 Capture Output for SSH Action doesn't work (Richard Williams via rkanter)
OOZIE-1961 Remove requireJavaVersion from enforcer rules (lars_francke via rkanter)