-
Notifications
You must be signed in to change notification settings - Fork 24.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ML] Extract persistent task methods from MlMetadata (#32319)
Move ML persistent task helper functions to the new class MlTasks and remove MLMetadataField after moving the string constant to MlMetadata.
- Loading branch information
Showing
40 changed files
with
262 additions
and
214 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 0 additions & 21 deletions
21
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MLMetadataField.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlTasks.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.core.ml; | ||
|
|
||
| import org.elasticsearch.common.Nullable; | ||
| import org.elasticsearch.persistent.PersistentTasksCustomMetaData; | ||
| import org.elasticsearch.xpack.core.ml.datafeed.DatafeedState; | ||
| import org.elasticsearch.xpack.core.ml.job.config.JobState; | ||
| import org.elasticsearch.xpack.core.ml.job.config.JobTaskState; | ||
|
|
||
| public final class MlTasks { | ||
|
|
||
| private MlTasks() { | ||
| } | ||
|
|
||
| /** | ||
| * Namespaces the task ids for jobs. | ||
| * A datafeed id can be used as a job id, because they are stored separately in cluster state. | ||
| */ | ||
| public static String jobTaskId(String jobId) { | ||
| return "job-" + jobId; | ||
| } | ||
|
|
||
| /** | ||
| * Namespaces the task ids for datafeeds. | ||
| * A job id can be used as a datafeed id, because they are stored separately in cluster state. | ||
| */ | ||
| public static String datafeedTaskId(String datafeedId) { | ||
| return "datafeed-" + datafeedId; | ||
| } | ||
|
|
||
| @Nullable | ||
| public static PersistentTasksCustomMetaData.PersistentTask<?> getJobTask(String jobId, @Nullable PersistentTasksCustomMetaData tasks) { | ||
| return tasks == null ? null : tasks.getTask(jobTaskId(jobId)); | ||
| } | ||
|
|
||
| @Nullable | ||
| public static PersistentTasksCustomMetaData.PersistentTask<?> getDatafeedTask(String datafeedId, | ||
| @Nullable PersistentTasksCustomMetaData tasks) { | ||
| return tasks == null ? null : tasks.getTask(datafeedTaskId(datafeedId)); | ||
| } | ||
|
|
||
| public static JobState getJobState(String jobId, @Nullable PersistentTasksCustomMetaData tasks) { | ||
| PersistentTasksCustomMetaData.PersistentTask<?> task = getJobTask(jobId, tasks); | ||
| if (task != null) { | ||
| JobTaskState jobTaskState = (JobTaskState) task.getState(); | ||
| if (jobTaskState == null) { | ||
| return JobState.OPENING; | ||
| } | ||
| return jobTaskState.getState(); | ||
| } | ||
| // If we haven't opened a job than there will be no persistent task, which is the same as if the job was closed | ||
| return JobState.CLOSED; | ||
| } | ||
|
|
||
| public static DatafeedState getDatafeedState(String datafeedId, @Nullable PersistentTasksCustomMetaData tasks) { | ||
| PersistentTasksCustomMetaData.PersistentTask<?> task = getDatafeedTask(datafeedId, tasks); | ||
| if (task != null && task.getState() != null) { | ||
| return (DatafeedState) task.getState(); | ||
| } else { | ||
| // If we haven't started a datafeed then there will be no persistent task, | ||
| // which is the same as if the datafeed was't started | ||
| return DatafeedState.STOPPED; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.