honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] Empty task response is ok. 

Original commit: elastic/x-pack-elasticsearch@9da321c531
This commit is contained in:
Martijn van Groningen 2017-04-13 12:12:44 +02:00
parent fc06f09b91
commit 81abd29598
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/src/main/java/org/elasticsearch/xpack/ml/action/CloseJobAction.java
View File

@ -307,6 +307,11 @@ public class CloseJobAction extends Action<CloseJobAction.Request, CloseJobActio
ClusterState state = clusterService.state();
request.resolvedJobIds = resolveAndValidateJobId(request.getJobId(), state).toArray(new String[0]);
if (request.resolvedJobIds.length == 0) {
listener.onResponse(new Response(true));
return;
}
Set<String> executorNodes = new HashSet<>();
for (String resolvedJobId : request.resolvedJobIds) {
JobManager.getJobOrThrowIfUnknown(state, resolvedJobId);
@ -323,10 +328,6 @@ public class CloseJobAction extends Action<CloseJobAction.Request, CloseJobActio
}
request.setNodes(executorNodes.toArray(new String[executorNodes.size()]));
if (request.resolvedJobIds.length == 0) {
listener.onResponse(new Response(true));
return;
}
if (request.isForce()) {
forceCloseJob(state, request, listener);
} else {
@ -374,9 +375,10 @@ public class CloseJobAction extends Action<CloseJobAction.Request, CloseJobActio
throw org.elasticsearch.ExceptionsHelper
.convertToElastic(failedNodeExceptions.get(0));
} else {
throw new IllegalStateException(
"Expected [" + request.resolvedJobIds.length
+ "] number of tasks but " + "got [" + tasks.size() + "]");
// This can happen we the actual task in the node no longer exists,
// which means the job(s) have already been closed.
// returning false, here because the current close request hasn't actually closed anything.
return new Response(false);
}
}