You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2018/01/24 10:18:51 UTC
kylin git commit: improve the way to delete a job
Repository: kylin
Updated Branches:
refs/heads/master 47bec8595 -> 8191b8ed3
improve the way to delete a job
Signed-off-by: Billy Liu <bi...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8191b8ed
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8191b8ed
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8191b8ed
Branch: refs/heads/master
Commit: 8191b8ed39c32d8cfa30eaa596c03552db736a70
Parents: 47bec85
Author: gwang3 <gw...@ebay.com>
Authored: Sun Jan 7 15:24:02 2018 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Wed Jan 24 18:18:37 2018 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/rest/service/JobService.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/8191b8ed/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
index c7fc47d..bd90742 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -630,9 +630,17 @@ public class JobService extends BasicService implements InitializingBean {
return job;
}
- public void dropJob(JobInstance job) throws IOException {
+ public void dropJob(JobInstance job) {
aclEvaluate.checkProjectOperationPermission(job);
+ if (job.getRelatedCube() != null && getCubeManager().getCube(job.getRelatedCube()) != null) {
+ if (job.getStatus() != JobStatusEnum.FINISHED && job.getStatus() != JobStatusEnum.DISCARDED) {
+ throw new BadRequestException(
+ "Only FINISHED and DISCARDED job can be deleted. Please wait for the job finishing or discard the job!!!");
+ }
+ }
getExecutableManager().deleteJob(job.getId());
+ logger.info("Delete job [" + job.getId() + "] trigger by + "
+ + SecurityContextHolder.getContext().getAuthentication().getName());
}
/**