Repository: oozie Updated Branches: refs/heads/branch-4.1 1b069ed28 -> 7faaf4038
OOZIE-2019 SLA miss processed on server2 not send email Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7faaf403 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7faaf403 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7faaf403 Branch: refs/heads/branch-4.1 Commit: 7faaf403888d08dfdb3b20a31f53ae1a4d210fda Parents: 1b069ed Author: Purshotam Shah <[email protected]> Authored: Tue Oct 14 13:58:59 2014 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue Oct 14 13:58:59 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/sla/SLARegistrationBean.java | 10 ++++------ .../oozie/sla/TestSLARegistrationGetJPAExecutor.java | 9 +++++++++ release-log.txt | 1 + 3 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/7faaf403/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java b/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java index a2260a4..9f16ada 100644 --- a/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java +++ b/core/src/main/java/org/apache/oozie/sla/SLARegistrationBean.java @@ -23,7 +23,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.StringTokenizer; import java.util.Map.Entry; import javax.persistence.Basic; @@ -288,17 +287,16 @@ public class SLARegistrationBean implements JsonBean { private void slaConfigStringToMap() { if (slaConfig != null) { - StringTokenizer st = new StringTokenizer(slaConfig, "},"); - while (st.hasMoreTokens()) { - String token = st.nextToken(); - String[] pair = token.split("="); + String[] splitString = slaConfig.split("},"); + for (String config : splitString) { + String[] pair = config.split("="); if (pair.length == 2) { slaConfigMap.put(pair[0].substring(1), pair[1]); } } } } - + public String slaConfigMapToString() { StringBuilder sb = new StringBuilder(); for (Entry<String, String> e : slaConfigMap.entrySet()) { http://git-wip-us.apache.org/repos/asf/oozie/blob/7faaf403/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java b/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java index 1c65d12..fee07d4 100644 --- a/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java +++ b/core/src/test/java/org/apache/oozie/sla/TestSLARegistrationGetJPAExecutor.java @@ -87,4 +87,13 @@ public class TestSLARegistrationGetJPAExecutor extends XDataTestCase { } } + public void testSlaConfigStringToMap() { + String slaConfig = "{[email protected]},{alert_events=START_MISS,DURATION_MISS,END_MISS},"; + SLARegistrationBean bean = new SLARegistrationBean(); + bean.setSlaConfig(slaConfig); + assertEquals(bean.getSlaConfigMap().size(), 2); + assertEquals(bean.getAlertEvents(), "START_MISS,DURATION_MISS,END_MISS"); + assertEquals(bean.getAlertContact(), "[email protected]"); + } + } http://git-wip-us.apache.org/repos/asf/oozie/blob/7faaf403/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7ef9c3b..b30e0c1 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (4.1 - unreleased) +OOZIE-2019 SLA miss processed on server2 not send email (puru) 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-2023 Job rerun can stuck in prep (puru)
