Skip to content

Commit 1ea7a3d

Browse files
[ML] Abort opening job if close is requested during reset
This commit checks if the job has been requested to close after the reset action completes as part of allocating the job to a new node. This ensures we do not proceed to start the job process even though the job had been requested to close. Closes elastic#74141
1 parent 54a024e commit 1ea7a3d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/task/OpenJobPersistentTasksExecutor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,10 @@ private void revertToCurrentSnapshot(String jobId, ActionListener<Boolean> liste
323323
}
324324

325325
private void openJob(JobTask jobTask) {
326+
if (jobTask.isClosing()) {
327+
logger.debug(() -> new ParameterizedMessage("[{}] Aborted opening job as it has been closed", jobTask.getJobId()));
328+
return;
329+
}
326330
String jobId = jobTask.getJobId();
327331
autodetectProcessManager.openJob(jobTask, clusterState, PERSISTENT_TASK_MASTER_NODE_TIMEOUT, (e2, shouldFinalizeJob) -> {
328332
if (e2 == null) {

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/ml/set_upgrade_mode.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ teardown:
158158

159159
---
160160
"Setting upgrade mode to disabled from enabled":
161-
- skip:
162-
version: "all"
163-
reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/74141"
164161
- do:
165162
ml.start_datafeed:
166163
datafeed_id: set-upgrade-mode-job-datafeed

0 commit comments

Comments
 (0)