From 35a191405b7b46bde42dee8bdecaff125afb2deb Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Wed, 28 May 2025 17:29:07 +0800 Subject: [PATCH] [opt](vcg) use "vcg cancel" as cancel message for warm up jobs --- .../java/org/apache/doris/cloud/CacheHotspotManager.java | 6 +++++- .../doris/cloud/catalog/CloudInstanceStatusChecker.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) 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 417f1b8d233e55..ed51961151e334 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) {