From 3aa9278ab1543b9d44c9883aa6c4243c9b657822 Mon Sep 17 00:00:00 2001 From: David Kyle Date: Mon, 21 May 2018 16:14:29 +0100 Subject: [PATCH] Filter undefined job groups from update calendar actions --- .../TransportUpdateCalendarJobAction.java | 13 +- .../xpack/ml/job/JobManager.java | 8 +- .../xpack/ml/job/persistence/JobProvider.java | 2 +- .../xpack/ml/integration/JobProviderIT.java | 2 +- .../rest-api-spec/test/ml/calendar_crud.yml | 120 +++++++++++++++--- 5 files changed, 115 insertions(+), 30 deletions(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateCalendarJobAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateCalendarJobAction.java index 0524cb28a0c11..12e6fb62fd727 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateCalendarJobAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateCalendarJobAction.java @@ -28,7 +28,6 @@ public class TransportUpdateCalendarJobAction extends HandledTransportAction { - private final ClusterService clusterService; private final JobProvider jobProvider; private final JobManager jobManager; @@ -36,27 +35,21 @@ public class TransportUpdateCalendarJobAction extends HandledTransportAction listener) { - ClusterState clusterState = clusterService.state(); - final MlMetadata mlMetadata = MlMetadata.getMlMetadata(clusterState); - Set jobIdsToAdd = Strings.tokenizeByCommaToSet(request.getJobIdsToAddExpression()); Set jobIdsToRemove = Strings.tokenizeByCommaToSet(request.getJobIdsToRemoveExpression()); - jobProvider.updateCalendar(request.getCalendarId(), jobIdsToAdd, jobIdsToRemove, mlMetadata, + jobProvider.updateCalendar(request.getCalendarId(), jobIdsToAdd, jobIdsToRemove, c -> { - List existingJobsOrGroups = - c.getJobIds().stream().filter(mlMetadata::isGroupOrJob).collect(Collectors.toList()); - jobManager.updateProcessOnCalendarChanged(existingJobsOrGroups); + jobManager.updateProcessOnCalendarChanged(c.getJobIds()); listener.onResponse(new PutCalendarAction.Response(c)); }, listener::onFailure); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java index 2d67e64ec60e7..3694e41a8b850 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java @@ -67,6 +67,7 @@ import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * Allows interactions with jobs. The managed interactions include: @@ -420,8 +421,13 @@ public void updateProcessOnFilterChanged(MlFilter filter) { public void updateProcessOnCalendarChanged(List calendarJobIds) { ClusterState clusterState = clusterService.state(); + MlMetadata mlMetadata = MlMetadata.getMlMetadata(clusterState); + + List existingJobsOrGroups = + calendarJobIds.stream().filter(mlMetadata::isGroupOrJob).collect(Collectors.toList()); + Set expandedJobIds = new HashSet<>(); - calendarJobIds.forEach(jobId -> expandedJobIds.addAll(expandJobIds(jobId, true, clusterState))); + existingJobsOrGroups.forEach(jobId -> expandedJobIds.addAll(expandJobIds(jobId, true, clusterState))); for (String jobId : expandedJobIds) { if (isJobOpen(clusterState, jobId)) { updateJobProcessNotifier.submitJobUpdate(UpdateParams.scheduledEventsUpdate(jobId), ActionListener.wrap( diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java index d7b10fb622bdf..8014bacf1e0f9 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobProvider.java @@ -1114,7 +1114,7 @@ public void getForecastRequestStats(String jobId, String forecastId, Consumer handler.accept(result.result), errorHandler, () -> null); } - public void updateCalendar(String calendarId, Set jobIdsToAdd, Set jobIdsToRemove, MlMetadata mlMetadata, + public void updateCalendar(String calendarId, Set jobIdsToAdd, Set jobIdsToRemove, Consumer handler, Consumer errorHandler) { ActionListener getCalendarListener = ActionListener.wrap( diff --git a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/JobProviderIT.java b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/JobProviderIT.java index 11f714ae449a0..120f04e95e70b 100644 --- a/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/JobProviderIT.java +++ b/x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/JobProviderIT.java @@ -244,7 +244,7 @@ private void updateCalendar(String calendarId, Set idsToAdd, Set throws Exception { CountDownLatch latch = new CountDownLatch(1); AtomicReference exceptionHolder = new AtomicReference<>(); - jobProvider.updateCalendar(calendarId, idsToAdd, idsToRemove, mlMetadata, + jobProvider.updateCalendar(calendarId, idsToAdd, idsToRemove, r -> latch.countDown(), e -> { exceptionHolder.set(e); diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/calendar_crud.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/calendar_crud.yml index 9b3572739cd8c..1406e04c8da2d 100644 --- a/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/calendar_crud.yml +++ b/x-pack/plugin/src/test/resources/rest-api-spec/test/ml/calendar_crud.yml @@ -86,23 +86,6 @@ xpack.ml.get_calendars: calendar_id: "dogs_of_the_year" - - do: - xpack.ml.put_calendar: - calendar_id: "new_cal_with_unknown_job_group" - body: > - { - "job_ids": ["cal-job", "unknown-job-group"] - } - - - do: - xpack.ml.get_calendars: - calendar_id: "new_cal_with_unknown_job_group" - - match: { count: 1 } - - match: - calendars.0: - calendar_id: "new_cal_with_unknown_job_group" - job_ids: ["cal-job", "unknown-job-group"] - --- "Test get calendar given missing": - do: @@ -714,3 +697,106 @@ - match: { calendar_id: "expression" } - length: { job_ids: 1 } - match: { job_ids.0: "bar-a" } + +--- +"Test calendar actions with new job group": + - do: + xpack.ml.put_job: + job_id: calendar-job + body: > + { + "analysis_config" : { + "detectors" :[{"function":"metric","field_name":"responsetime","by_field_name":"airline"}] + }, + "data_description" : { + } + } + + - do: + xpack.ml.put_calendar: + calendar_id: "cal_with_new_job_group" + body: > + { + "job_ids": ["calendar-job", "new-job-group"] + } + + - do: + xpack.ml.get_calendars: + calendar_id: "cal_with_new_job_group" + - match: { count: 1 } + - match: + calendars.0: + calendar_id: "cal_with_new_job_group" + job_ids: ["calendar-job", "new-job-group"] + + - do: + xpack.ml.post_calendar_events: + calendar_id: "cal_with_new_job_group" + body: > + { + "events" : [{ "description": "beach", "start_time": "2018-05-01T00:00:00Z", "end_time": "2018-05-06T00:00:00Z" }] + } + + - do: + xpack.ml.get_calendar_events: + calendar_id: cal_with_new_job_group + - length: { events: 1 } + - match: { events.0.description: beach } + + - do: + xpack.ml.delete_calendar: + calendar_id: "cal_with_new_job_group" + + - do: + xpack.ml.put_calendar: + calendar_id: "started_empty_calendar" + + - do: + xpack.ml.put_calendar_job: + calendar_id: "started_empty_calendar" + job_id: "new-group" + - match: { calendar_id: "started_empty_calendar" } + - length: { job_ids: 1 } + + - do: + xpack.ml.get_calendars: + calendar_id: "started_empty_calendar" + - match: { count: 1 } + - match: + calendars.0: + calendar_id: "started_empty_calendar" + job_ids: ["new-group"] + + - do: + xpack.ml.post_calendar_events: + calendar_id: "started_empty_calendar" + body: > + { + "events" : [{ "description": "beach", "start_time": "2018-05-01T00:00:00Z", "end_time": "2018-05-06T00:00:00Z" }] + } + + - do: + xpack.ml.get_calendar_events: + calendar_id: "started_empty_calendar" + - length: { events: 1 } + - match: { events.0.description: beach } + - set: { events.0.event_id: beach_event_id } + + - do: + xpack.ml.delete_calendar_event: + calendar_id: "started_empty_calendar" + event_id: $beach_event_id + + - do: + xpack.ml.get_calendar_events: + calendar_id: "started_empty_calendar" + - length: { events: 0 } + + - do: + xpack.ml.delete_calendar: + calendar_id: "started_empty_calendar" + + - do: + catch: missing + xpack.ml.get_calendars: + calendar_id: "started_empty_calendar"