[19/50] [abbrv] oozie git commit: OOZIE-2572 SLA DURATION miss not shown when job is running for longer than expected time

2016-10-10 Thread gezapeti 
OOZIE-2572 SLA DURATION miss not shown when job is running for longer than 
expected time


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f45e1eb7
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f45e1eb7
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f45e1eb7

Branch: refs/heads/oya
Commit: f45e1eb7701e9f9112bc7a295700eb9949ae6ac2
Parents: 5759397
Author: Purshotam Shah 
Authored: Tue Sep 20 14:05:21 2016 -0700
Committer: Purshotam Shah 
Committed: Tue Sep 20 14:05:21 2016 -0700

--
 .../org/apache/oozie/sla/SLASummaryBean.java|  8 +++---
 .../apache/oozie/servlet/TestV2SLAServlet.java  |  6 ++---
 docs/src/site/twiki/DG_SLAMonitoring.twiki  | 26 ++--
 release-log.txt |  1 +
 .../webapp/console/sla/js/oozie-sla-table.js| 21 +---
 5 files changed, 22 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/f45e1eb7/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
--
diff --git a/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java 
b/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
index 3b2cebd..cfe1522 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
@@ -423,7 +423,7 @@ public class SLASummaryBean implements JsonBean {
 }
 json.put(JsonTags.SLA_SUMMARY_EXPECTED_DURATION, expectedDuration);
 if (actualDuration == -1 && expectedDuration != -1 && actualStartTS != 
null) {
-long currentDur = (new Date().getTime() - actualStartTS.getTime()) 
/ (1000 * 60);
+long currentDur = new Date().getTime() - actualStartTS.getTime();
 json.put(JsonTags.SLA_SUMMARY_ACTUAL_DURATION, currentDur);
 }
 else {
@@ -432,7 +432,7 @@ public class SLASummaryBean implements JsonBean {
 Long durationDelay = eventMap.get(EventStatus.DURATION_MET) != null ? 
eventMap.get(EventStatus.DURATION_MET)
 : eventMap.get(EventStatus.DURATION_MISS);
 if (durationDelay != null) {
-json.put(JsonTags.SLA_SUMMARY_DURATION_DELAY, durationDelay);
+json.put(JsonTags.SLA_SUMMARY_DURATION_DELAY, durationDelay / 
(1000 * 60));
 }
 json.put(JsonTags.SLA_SUMMARY_JOB_STATUS, jobStatus);
 json.put(JsonTags.SLA_SUMMARY_SLA_STATUS, slaStatus);
@@ -482,9 +482,9 @@ public class SLASummaryBean implements JsonBean {
 }
 else {
 if (actualStartTS != null) {
-long currentDur = (new Date().getTime() - 
actualStartTS.getTime()) / (1000 * 60);
+long currentDur = new Date().getTime() - 
actualStartTS.getTime();
 if (expectedDuration < currentDur) {
-events.put(EventStatus.DURATION_MISS, (currentDur - 
expectedDuration));
+events.put(EventStatus.DURATION_MISS, currentDur - 
expectedDuration);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/oozie/blob/f45e1eb7/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
--
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java 
b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
index db509ac..03f2323 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
@@ -193,7 +193,7 @@ public class TestV2SLAServlet extends DagServletTestCase {
 String id = (String)json.get(JsonTags.SLA_SUMMARY_ID);
 if(id.equals(cjBean1.getId() + "@1")) {
 assertEquals(-2L, 
json.get(JsonTags.SLA_SUMMARY_START_DELAY));
-assertEquals(-1L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
+assertEquals(0L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
 assertEquals(-1L, 
json.get(JsonTags.SLA_SUMMARY_END_DELAY));
 }
 }
@@ -232,7 +232,7 @@ public class TestV2SLAServlet extends DagServletTestCase {
 parentId = (String) json.get(JsonTags.SLA_SUMMARY_PARENT_ID);
 assertTrue(parentId.equals(cjBean1.getId()));
 assertEquals(1L, json.get(JsonTags.SLA_SUMMARY_START_DELAY));
-assertEquals(1L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
+assertEquals(0L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));

oozie git commit: OOZIE-2572 SLA DURATION miss not shown when job is running for longer than expected time

2016-09-20 Thread puru 
Repository: oozie
Updated Branches:
  refs/heads/master 5759397a9 -> f45e1eb77


OOZIE-2572 SLA DURATION miss not shown when job is running for longer than 
expected time


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f45e1eb7
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f45e1eb7
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f45e1eb7

Branch: refs/heads/master
Commit: f45e1eb7701e9f9112bc7a295700eb9949ae6ac2
Parents: 5759397
Author: Purshotam Shah 
Authored: Tue Sep 20 14:05:21 2016 -0700
Committer: Purshotam Shah 
Committed: Tue Sep 20 14:05:21 2016 -0700

--
 .../org/apache/oozie/sla/SLASummaryBean.java|  8 +++---
 .../apache/oozie/servlet/TestV2SLAServlet.java  |  6 ++---
 docs/src/site/twiki/DG_SLAMonitoring.twiki  | 26 ++--
 release-log.txt |  1 +
 .../webapp/console/sla/js/oozie-sla-table.js| 21 +---
 5 files changed, 22 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/f45e1eb7/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
--
diff --git a/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java 
b/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
index 3b2cebd..cfe1522 100644
--- a/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
+++ b/core/src/main/java/org/apache/oozie/sla/SLASummaryBean.java
@@ -423,7 +423,7 @@ public class SLASummaryBean implements JsonBean {
 }
 json.put(JsonTags.SLA_SUMMARY_EXPECTED_DURATION, expectedDuration);
 if (actualDuration == -1 && expectedDuration != -1 && actualStartTS != 
null) {
-long currentDur = (new Date().getTime() - actualStartTS.getTime()) 
/ (1000 * 60);
+long currentDur = new Date().getTime() - actualStartTS.getTime();
 json.put(JsonTags.SLA_SUMMARY_ACTUAL_DURATION, currentDur);
 }
 else {
@@ -432,7 +432,7 @@ public class SLASummaryBean implements JsonBean {
 Long durationDelay = eventMap.get(EventStatus.DURATION_MET) != null ? 
eventMap.get(EventStatus.DURATION_MET)
 : eventMap.get(EventStatus.DURATION_MISS);
 if (durationDelay != null) {
-json.put(JsonTags.SLA_SUMMARY_DURATION_DELAY, durationDelay);
+json.put(JsonTags.SLA_SUMMARY_DURATION_DELAY, durationDelay / 
(1000 * 60));
 }
 json.put(JsonTags.SLA_SUMMARY_JOB_STATUS, jobStatus);
 json.put(JsonTags.SLA_SUMMARY_SLA_STATUS, slaStatus);
@@ -482,9 +482,9 @@ public class SLASummaryBean implements JsonBean {
 }
 else {
 if (actualStartTS != null) {
-long currentDur = (new Date().getTime() - 
actualStartTS.getTime()) / (1000 * 60);
+long currentDur = new Date().getTime() - 
actualStartTS.getTime();
 if (expectedDuration < currentDur) {
-events.put(EventStatus.DURATION_MISS, (currentDur - 
expectedDuration));
+events.put(EventStatus.DURATION_MISS, currentDur - 
expectedDuration);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/oozie/blob/f45e1eb7/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
--
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java 
b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
index db509ac..03f2323 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java
@@ -193,7 +193,7 @@ public class TestV2SLAServlet extends DagServletTestCase {
 String id = (String)json.get(JsonTags.SLA_SUMMARY_ID);
 if(id.equals(cjBean1.getId() + "@1")) {
 assertEquals(-2L, 
json.get(JsonTags.SLA_SUMMARY_START_DELAY));
-assertEquals(-1L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
+assertEquals(0L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
 assertEquals(-1L, 
json.get(JsonTags.SLA_SUMMARY_END_DELAY));
 }
 }
@@ -232,7 +232,7 @@ public class TestV2SLAServlet extends DagServletTestCase {
 parentId = (String) json.get(JsonTags.SLA_SUMMARY_PARENT_ID);
 assertTrue(parentId.equals(cjBean1.getId()));
 assertEquals(1L, json.get(JsonTags.SLA_SUMMARY_START_DELAY));
-assertEquals(1L, 
json.get(JsonTags.SLA_SUMMARY_DURATION_DELAY));
+