Skip to content

Commit c1dc10a

Browse files
[7.x][ML] Remove unused method in TransportStartDataFrameAnalyticsAction (#68409) (#68430)
Removes method `searchStoredProgress` which is now unused as we retrieve progress via a call in the _stats API. Backport of #68409
1 parent 69d93d1 commit c1dc10a

File tree

1 file changed

+1
-34
lines changed

1 file changed

+1
-34
lines changed

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
import org.elasticsearch.action.ActionListener;
1616
import org.elasticsearch.action.search.SearchAction;
1717
import org.elasticsearch.action.search.SearchRequest;
18-
import org.elasticsearch.action.search.SearchResponse;
1918
import org.elasticsearch.action.support.ActionFilters;
20-
import org.elasticsearch.action.support.IndicesOptions;
2119
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
2220
import org.elasticsearch.client.Client;
2321
import org.elasticsearch.cluster.ClusterState;
@@ -32,7 +30,6 @@
3230
import org.elasticsearch.common.unit.ByteSizeValue;
3331
import org.elasticsearch.common.unit.TimeValue;
3432
import org.elasticsearch.index.IndexNotFoundException;
35-
import org.elasticsearch.index.query.QueryBuilders;
3633
import org.elasticsearch.license.License;
3734
import org.elasticsearch.license.LicenseUtils;
3835
import org.elasticsearch.license.XPackLicenseState;
@@ -42,7 +39,6 @@
4239
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
4340
import org.elasticsearch.persistent.PersistentTasksService;
4441
import org.elasticsearch.rest.RestStatus;
45-
import org.elasticsearch.search.SearchHit;
4642
import org.elasticsearch.tasks.TaskId;
4743
import org.elasticsearch.threadpool.ThreadPool;
4844
import org.elasticsearch.transport.TransportService;
@@ -73,7 +69,6 @@
7369
import org.elasticsearch.xpack.ml.dataframe.DataFrameAnalyticsTask;
7470
import org.elasticsearch.xpack.ml.dataframe.MappingsMerger;
7571
import org.elasticsearch.xpack.ml.dataframe.SourceDestValidations;
76-
import org.elasticsearch.xpack.ml.dataframe.StoredProgress;
7772
import org.elasticsearch.xpack.ml.dataframe.extractor.DataFrameDataExtractorFactory;
7873
import org.elasticsearch.xpack.ml.dataframe.extractor.ExtractedFieldsDetectorFactory;
7974
import org.elasticsearch.xpack.ml.dataframe.persistence.DataFrameAnalyticsConfigProvider;
@@ -83,7 +78,6 @@
8378
import org.elasticsearch.xpack.ml.notifications.DataFrameAnalyticsAuditor;
8479
import org.elasticsearch.xpack.ml.process.MlMemoryTracker;
8580
import org.elasticsearch.xpack.ml.task.AbstractJobPersistentTasksExecutor;
86-
import org.elasticsearch.xpack.ml.utils.persistence.MlParserUtils;
8781

8882
import java.util.List;
8983
import java.util.Map;
@@ -196,9 +190,7 @@ public void onFailure(Exception e) {
196190

197191
// Perform memory usage estimation for this config
198192
ActionListener<StartContext> startContextListener = ActionListener.wrap(
199-
startContext -> {
200-
estimateMemoryUsageAndUpdateMemoryTracker(startContext, memoryUsageHandledListener);
201-
},
193+
startContext -> estimateMemoryUsageAndUpdateMemoryTracker(startContext, memoryUsageHandledListener),
202194
listener::onFailure
203195
);
204196

@@ -695,31 +687,6 @@ protected void nodeOperation(AllocatedPersistentTask task, TaskParams params, Pe
695687
MlIndexAndAlias.installIndexTemplateIfRequired(clusterState, client, inferenceIndexTemplate, templateCheckListener);
696688
}
697689

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-
723690
private void executeTask(DataFrameAnalyticsTask task) {
724691
DataFrameAnalyticsTaskState startedState = new DataFrameAnalyticsTaskState(DataFrameAnalyticsState.STARTED,
725692
task.getAllocationId(), null);

0 commit comments

Comments
 (0)