|
15 | 15 | import org.elasticsearch.action.ActionListener; |
16 | 16 | import org.elasticsearch.action.search.SearchAction; |
17 | 17 | import org.elasticsearch.action.search.SearchRequest; |
18 | | -import org.elasticsearch.action.search.SearchResponse; |
19 | 18 | import org.elasticsearch.action.support.ActionFilters; |
20 | | -import org.elasticsearch.action.support.IndicesOptions; |
21 | 19 | import org.elasticsearch.action.support.master.TransportMasterNodeAction; |
22 | 20 | import org.elasticsearch.client.Client; |
23 | 21 | import org.elasticsearch.cluster.ClusterState; |
|
32 | 30 | import org.elasticsearch.common.unit.ByteSizeValue; |
33 | 31 | import org.elasticsearch.common.unit.TimeValue; |
34 | 32 | import org.elasticsearch.index.IndexNotFoundException; |
35 | | -import org.elasticsearch.index.query.QueryBuilders; |
36 | 33 | import org.elasticsearch.license.License; |
37 | 34 | import org.elasticsearch.license.LicenseUtils; |
38 | 35 | import org.elasticsearch.license.XPackLicenseState; |
|
42 | 39 | import org.elasticsearch.persistent.PersistentTasksCustomMetadata; |
43 | 40 | import org.elasticsearch.persistent.PersistentTasksService; |
44 | 41 | import org.elasticsearch.rest.RestStatus; |
45 | | -import org.elasticsearch.search.SearchHit; |
46 | 42 | import org.elasticsearch.tasks.TaskId; |
47 | 43 | import org.elasticsearch.threadpool.ThreadPool; |
48 | 44 | import org.elasticsearch.transport.TransportService; |
|
73 | 69 | import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask; |
74 | 70 | import org.elasticsearch.xpack.ml.dataframe.MappingsMerger; |
75 | 71 | import org.elasticsearch.xpack.ml.dataframe.SourceDestValidations; |
76 | | -import org.elasticsearch.xpack.ml.dataframe.StoredProgress; |
77 | 72 | import org.elasticsearch.xpack.ml.dataframe.extractor.DataFrameDataExtractorFactory; |
78 | 73 | import org.elasticsearch.xpack.ml.dataframe.extractor.ExtractedFieldsDetectorFactory; |
79 | 74 | import org.elasticsearch.xpack.ml.dataframe.persistence.DataFrameAnalyticsConfigProvider; |
|
83 | 78 | import org.elasticsearch.xpack.ml.notifications.DataFrameAnalyticsAuditor; |
84 | 79 | import org.elasticsearch.xpack.ml.process.MlMemoryTracker; |
85 | 80 | import org.elasticsearch.xpack.ml.task.AbstractJobPersistentTasksExecutor; |
86 | | -import org.elasticsearch.xpack.ml.utils.persistence.MlParserUtils; |
87 | 81 |
|
88 | 82 | import java.util.List; |
89 | 83 | import java.util.Map; |
@@ -196,9 +190,7 @@ public void onFailure(Exception e) { |
196 | 190 |
|
197 | 191 | // Perform memory usage estimation for this config |
198 | 192 | ActionListener<StartContext> startContextListener = ActionListener.wrap( |
199 | | - startContext -> { |
200 | | - estimateMemoryUsageAndUpdateMemoryTracker(startContext, memoryUsageHandledListener); |
201 | | - }, |
| 193 | + startContext -> estimateMemoryUsageAndUpdateMemoryTracker(startContext, memoryUsageHandledListener), |
202 | 194 | listener::onFailure |
203 | 195 | ); |
204 | 196 |
|
@@ -695,31 +687,6 @@ protected void nodeOperation(AllocatedPersistentTask task, TaskParams params, Pe |
695 | 687 | MlIndexAndAlias.installIndexTemplateIfRequired(clusterState, client, inferenceIndexTemplate, templateCheckListener); |
696 | 688 | } |
697 | 689 |
|
698 | | - private void searchProgressFromIndex(String jobId, ActionListener<StoredProgress> listener) { |
699 | | - SearchRequest searchRequest = new SearchRequest(AnomalyDetectorsIndex.jobStateIndexPattern()); |
700 | | - searchRequest.indicesOptions(IndicesOptions.lenientExpandOpen()); |
701 | | - searchRequest.source().size(1); |
702 | | - searchRequest.source().query(QueryBuilders.idsQuery().addIds(StoredProgress.documentId(jobId))); |
703 | | - searchRequest.allowPartialSearchResults(false); |
704 | | - |
705 | | - ActionListener<SearchResponse> searchListener = ActionListener.wrap( |
706 | | - searchResponse -> { |
707 | | - SearchHit[] hits = searchResponse.getHits().getHits(); |
708 | | - if (hits.length == 0) { |
709 | | - logger.debug(() -> new ParameterizedMessage("[{}] No stored progress found", jobId)); |
710 | | - listener.onResponse(null); |
711 | | - } else { |
712 | | - StoredProgress storedProgress = MlParserUtils.parse(hits[0], StoredProgress.PARSER); |
713 | | - logger.debug(() -> new ParameterizedMessage("[{}] Found stored progress {}", jobId, storedProgress.get().get(0))); |
714 | | - listener.onResponse(storedProgress); |
715 | | - } |
716 | | - }, |
717 | | - listener::onFailure |
718 | | - ); |
719 | | - |
720 | | - executeAsyncWithOrigin(client, ML_ORIGIN, SearchAction.INSTANCE, searchRequest, searchListener); |
721 | | - } |
722 | | - |
723 | 690 | private void executeTask(DataFrameAnalyticsTask task) { |
724 | 691 | DataFrameAnalyticsTaskState startedState = new DataFrameAnalyticsTaskState(DataFrameAnalyticsState.STARTED, |
725 | 692 | task.getAllocationId(), null); |
|
0 commit comments