Repository: oozie Updated Branches: refs/heads/master 4de5533c5 -> 2dd10ff0f
OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2dd10ff0 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2dd10ff0 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2dd10ff0 Branch: refs/heads/master Commit: 2dd10ff0fb7d7b53c0c177d5d4439fa065366f4c Parents: 4de5533 Author: Andras Piros <andras.pi...@cloudera.com> Authored: Mon Jul 30 09:58:47 2018 +0200 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Mon Jul 30 09:58:47 2018 +0200 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java | 6 ++++-- .../test/java/org/apache/oozie/servlet/TestV2SLAServlet.java | 6 ++++++ release-log.txt | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java b/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java index d578eaf..3982d1e 100644 --- a/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java +++ b/core/src/main/java/org/apache/oozie/servlet/V2SLAServlet.java @@ -190,8 +190,10 @@ public class V2SLAServlet extends SLAServlet { } List<String> jobIds = new ArrayList<String>(); - for(SLASummaryBean summaryBean:slaSummaryList){ - jobIds.add(summaryBean.getId()); + if (slaSummaryList != null) { + for (SLASummaryBean summaryBean : slaSummaryList) { + jobIds.add(summaryBean.getId()); + } } List<SLARegistrationBean> SLARegistrationList = SLARegistrationQueryExecutor.getInstance().getList( SLARegQuery.GET_SLA_CONFIGS, jobIds); http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/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 d2bdb51..c2bbf1e 100644 --- a/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java +++ b/core/src/test/java/org/apache/oozie/servlet/TestV2SLAServlet.java @@ -183,6 +183,12 @@ public class TestV2SLAServlet extends DagServletTestCase { conn.setRequestMethod("GET"); assertEquals(HttpServletResponse.SC_BAD_REQUEST, conn.getResponseCode()); + //test filter nonexistent bundle ID + queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT"); + queryParams.put(RestConstants.JOBS_FILTER_PARAM, String.format("bundle=%s","xxxx")); + array = getSLAJSONResponse(queryParams); + assertEquals(0, array.size()); + //test filter bundle ID queryParams.put(RestConstants.TIME_ZONE_PARAM, "GMT"); queryParams.put(RestConstants.JOBS_FILTER_PARAM, String.format("bundle=%s",bundleId)); http://git-wip-us.apache.org/repos/asf/oozie/blob/2dd10ff0/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 2005b5f..733ea3d 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3309 Runtime error during /v2/sla filtering for bundle (asalamon74 via andras.piros) OOZIE-3306 Make it possible to override maven dependency plugin version number (asalamon74 via andras.piros) OOZIE-3208 "It should never happen" error messages should be more specific to root cause (kmarton via andras.piros) OOZIE-2791 ShareLib installation may fail on busy Hadoop clusters (asasvari, kmarton via pbacsko, andras.piros)
