Author: mona
Date: Wed Jul 10 22:47:16 2013
New Revision: 1502034
URL: http://svn.apache.org/r1502034
Log:
OOZIE-1446 SLACalcStatus not updating the last modified time correctly and
duplicate DURATION_* event (virag,mona via mona)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java?rev=1502034&r1=1502033&r2=1502034&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java
(original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalcStatus.java Wed
Jul 10 22:47:16 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/trunk/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java?rev=1502034&r1=1502033&r2=1502034&view=diff
==============================================================================
---
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
(original)
+++
oozie/trunk/core/src/main/java/org/apache/oozie/sla/SLACalculatorMemory.java
Wed Jul 10 22:47:16 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) {
