Check job exists before opening & closing (elastic/elasticsearch#530)

Original commit: elastic/x-pack-elasticsearch@037ea30a12
This commit is contained in:
David Kyle 2016-12-12 12:50:29 +00:00 committed by GitHub
parent 1d4df3903c
commit 46938b281c
2 changed files with 4 additions and 0 deletions

View File

@ -172,6 +172,8 @@ public class CloseJobAction extends Action<CloseJobAction.Request, CloseJobActio
@Override @Override
protected void masterOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception { protected void masterOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
jobManager.getJobOrThrowIfUnknown(request.getJobId());
UpdateJobStatusAction.Request updateStatusRequest = new UpdateJobStatusAction.Request(request.getJobId(), JobStatus.CLOSING); UpdateJobStatusAction.Request updateStatusRequest = new UpdateJobStatusAction.Request(request.getJobId(), JobStatus.CLOSING);
ActionListener<UpdateJobStatusAction.Response> delegateListener = ActionListener.wrap( ActionListener<UpdateJobStatusAction.Response> delegateListener = ActionListener.wrap(
response -> respondWhenJobIsClosed(request.getJobId(), listener), listener::onFailure); response -> respondWhenJobIsClosed(request.getJobId(), listener), listener::onFailure);

View File

@ -192,6 +192,8 @@ public class OpenJobAction extends Action<OpenJobAction.Request, OpenJobAction.R
@Override @Override
protected void masterOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception { protected void masterOperation(Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
jobManager.getJobOrThrowIfUnknown(request.getJobId());
ActionListener<Response> delegateListener = ActionListener.wrap(response -> respondWhenJobIsOpened(request, listener), ActionListener<Response> delegateListener = ActionListener.wrap(response -> respondWhenJobIsOpened(request, listener),
listener::onFailure); listener::onFailure);
jobManager.openJob(request, delegateListener); jobManager.openJob(request, delegateListener);