Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ML] fix ml API cancellation when http connection is closed #88616

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ protected void doExecute(
EvaluateDataFrameAction.Request request,
ActionListener<EvaluateDataFrameAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
ActionListener<List<Void>> resultsListener = ActionListener.wrap(unused -> {
EvaluateDataFrameAction.Response response = new EvaluateDataFrameAction.Response(
request.getEvaluation().getName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ private void explain(
ExplainDataFrameAnalyticsAction.Request request,
ActionListener<ExplainDataFrameAnalyticsAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
final ExtractedFieldsDetectorFactory extractedFieldsDetectorFactory = new ExtractedFieldsDetectorFactory(
new ParentTaskAssigningClient(client, parentTaskId)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public TransportGetCategoriesAction(

@Override
protected void doExecute(Task task, GetCategoriesAction.Request request, ActionListener<GetCategoriesAction.Response> listener) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
jobManager.jobExists(request.getJobId(), parentTaskId, ActionListener.wrap(jobExists -> {
Integer from = request.getPageParams() != null ? request.getPageParams().getFrom() : null;
Integer size = request.getPageParams() != null ? request.getPageParams().getSize() : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ protected void doExecute(
GetDataFrameAnalyticsStatsAction.Request request,
ActionListener<GetDataFrameAnalyticsStatsAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
logger.debug("Get stats for data frame analytics [{}]", request.getId());

ActionListener<GetDataFrameAnalyticsAction.Response> getResponseListener = ActionListener.wrap(getResponse -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected void masterOperation(
ClusterState state,
ActionListener<GetDatafeedsAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
logger.debug("Get datafeed '{}'", request.getDatafeedId());

datafeedManager.getDatafeeds(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
ClusterState state = clusterService.state();
final PersistentTasksCustomMetadata tasksInProgress = state.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
final Response.Builder responseBuilder = new Response.Builder();
final TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
final TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());

// 5. Build response
ActionListener<GetDatafeedRunningStateAction.Response> runtimeStateListener = ActionListener.wrap(runtimeStateResponse -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected void masterOperation(Task task, Request request, ClusterState state, A
logger.debug(() -> format("[%s] get stats for model snapshot [%s] upgrades", request.getJobId(), request.getSnapshotId()));
final PersistentTasksCustomMetadata tasksInProgress = state.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
final Collection<PersistentTasksCustomMetadata.PersistentTask<?>> snapshotUpgrades = MlTasks.snapshotUpgradeTasks(tasksInProgress);
final TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
final TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());

// 2. Now that we have the job IDs, find the relevant model snapshot upgrades
ActionListener<List<Job.Builder>> expandIdsListener = ActionListener.wrap(jobs -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ protected void masterOperation(
ClusterState state,
ActionListener<GetJobsAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
logger.debug("Get job '{}'", request.getJobId());
jobManager.expandJobBuilders(
request.getJobId(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public TransportGetJobsStatsAction(
@Override
protected void doExecute(Task task, GetJobsStatsAction.Request request, ActionListener<GetJobsStatsAction.Response> finalListener) {
logger.debug("Get stats for job [{}]", request.getJobId());
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());

ClusterState state = clusterService.state();
PersistentTasksCustomMetadata tasks = state.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
Expand Down Expand Up @@ -144,7 +144,7 @@ protected void taskOperation(
JobTask task,
ActionListener<QueryPage<JobStats>> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), actionTask.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), actionTask.getId());
String jobId = task.getJobId();
ClusterState state = clusterService.state();
PersistentTasksCustomMetadata tasks = state.getMetadata().custom(PersistentTasksCustomMetadata.TYPE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected void doExecute(
GetModelSnapshotsAction.Request request,
ActionListener<GetModelSnapshotsAction.Response> listener
) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
logger.debug(
() -> format(
"Get model snapshots for job %s snapshot ID %s. from = %s, size = %s start = '%s', end='%s', sort=%s descending=%s",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ protected void doExecute(
InferTrainedModelDeploymentAction.Request request,
ActionListener<InferTrainedModelDeploymentAction.Response> listener
) {
TaskId taskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId taskId = new TaskId(clusterService.localNode().getId(), task.getId());
final String deploymentId = request.getDeploymentId();
// We need to check whether there is at least an assigned task here, otherwise we cannot redirect to the
// node running the job task.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public TransportInternalInferModelAction(
protected void doExecute(Task task, Request request, ActionListener<Response> listener) {

Response.Builder responseBuilder = Response.builder();
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());

if (MachineLearningField.ML_API_FEATURE.check(licenseState)) {
responseBuilder.setLicensed(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
}

void preview(Task task, DataFrameAnalyticsConfig config, ActionListener<Response> listener) {
final TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
final TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
final ExtractedFieldsDetectorFactory extractedFieldsDetectorFactory = new ExtractedFieldsDetectorFactory(
new ParentTaskAssigningClient(client, parentTaskId)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public TransportPreviewDatafeedAction(

@Override
protected void doExecute(Task task, PreviewDatafeedAction.Request request, ActionListener<PreviewDatafeedAction.Response> listener) {
TaskId parentTaskId = new TaskId(clusterService.getNodeName(), task.getId());
TaskId parentTaskId = new TaskId(clusterService.localNode().getId(), task.getId());
ActionListener<DatafeedConfig> datafeedConfigActionListener = ActionListener.wrap(datafeedConfig -> {
if (request.getJobConfig() != null) {
previewDatafeed(parentTaskId, datafeedConfig, request.getJobConfig().build(new Date()), request, listener);
Expand Down