Author: mona
Date: Wed Jul 10 22:50:13 2013
New Revision: 1502037
URL: http://svn.apache.org/r1502037
Log:
OOZIE-1446 SLACalcStatus not updating the last modified time correctly and
duplicate DURATION_* event (virag,mona via mona)
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java?rev=1502037&r1=1502036&r2=1502037&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
Wed Jul 10 22:50:13 2013
@@ -84,7 +84,6 @@ public class SLACalcStatus extends SLAEv
setActualStart(a.getActualStart());
setActualEnd(a.getActualEnd());
setActualDuration(a.getActualDuration());
- setLastModifiedTime(a.getLastModifiedTime());
setEventProcessed(a.getEventProcessed());
}
Modified:
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java?rev=1502037&r1=1502036&r2=1502037&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
(original)
+++
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
Wed Jul 10 22:50:13 2013
@@ -726,7 +726,9 @@ public class SLACalculatorMemory impleme
}
if (ended) {
slaCalc.setActualDuration(slaCalc.getActualEnd().getTime() -
slaCalc.getActualStart().getTime());
- processDurationSLA(slaCalc.getExpectedDuration(),
slaCalc.getActualDuration(), slaCalc);
+ if (((slaCalc.getEventProcessed() >> 1) & 1) == 0) {
+ processDurationSLA(slaCalc.getExpectedDuration(),
slaCalc.getActualDuration(), slaCalc);
+ }
slaCalc.setEventProcessed(8);
}
if (isMiss) {
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1502037&r1=1502036&r2=1502037&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Wed Jul 10 22:50:13 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 release
+OOZIE-1446 SLACalcStatus not updating the last modified time correctly and
duplicate DURATION_* event (virag,mona via mona)
OOZIE-1249 SLA Documentation (mona,virag,rohini via rohini)
OOZIE-1441 Fix bugs related to coordchange and parentId in events (mona,virag
via virag)
OOZIE-1444 Job DAG causes OOM. Remove refresh option (rohini)
