diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java index 6797ce45acb7de..b58c87d88a07e9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java @@ -840,11 +840,15 @@ public void cancel(CancelCloudWarmUpStmt stmt) throws DdlException { } public void cancel(long jobId) throws DdlException { + cancel(jobId, "user cancel"); + } + + public void cancel(long jobId, String msg) throws DdlException { CloudWarmUpJob job = cloudWarmUpJobs.get(jobId); if (job == null) { throw new DdlException("job id: " + jobId + " does not exist."); } - if (!job.cancel("user cancel", true)) { + if (!job.cancel(msg, true)) { throw new DdlException("job can not be cancelled. State: " + job.getJobState()); } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java index e40ee50ae58feb..9f0c51709e0411 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java @@ -152,7 +152,7 @@ private void cancelCacheJobs(ComputeGroup vcgInFe, List jobIds) { try { if (Env.getCurrentEnv().isMaster()) { // cancel old jobId, will write editlog, so just master can do - cacheHotspotManager.cancel(Long.parseLong(jobId)); + cacheHotspotManager.cancel(Long.parseLong(jobId), "vcg cancel"); LOG.info("virtual compute group {}, cancel jobId {}", vcgInFe.getName(), jobId); } } catch (DdlException e) {