minor, prevent to drop job if it is stopped
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8e1a7d51 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8e1a7d51 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8e1a7d51 Branch: refs/heads/kylin-2.1.x Commit: 8e1a7d514519bedfbadccd3ba252ca240b56137f Parents: c8acbc6 Author: Cheng Wang <cheng.w...@kyligence.io> Authored: Thu Jun 29 15:52:09 2017 +0800 Committer: æ <cheng.w...@kyligence.io> Committed: Thu Jun 29 16:08:04 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/rest/controller2/JobControllerV2.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8e1a7d51/server-base/src/main/java/org/apache/kylin/rest/controller2/JobControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/JobControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/JobControllerV2.java index f9db6d8..a86082c 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/JobControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/JobControllerV2.java @@ -282,8 +282,10 @@ public class JobControllerV2 extends BasicController { JobInstance jobInstance = jobService.getJobInstance(jobId); JobStatusEnum status = jobInstance.getStatus(); - if (status == JobStatusEnum.NEW || status == JobStatusEnum.PENDING || status == JobStatusEnum.RUNNING) { - throw new BadRequestException("Cannot drop running job " + jobInstance.getName()); + if (status == JobStatusEnum.NEW || status == JobStatusEnum.PENDING || status == JobStatusEnum.RUNNING + || status == JobStatusEnum.STOPPED) { + throw new BadRequestException( + "Cannot drop running job " + jobInstance.getName() + ", please discard it first."); } jobService.dropJob(jobInstance);
