This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 93dc6e7600c [fix](vcg) use "vcg cancel" as cancel message for warm up
jobs (#53752)
93dc6e7600c is described below
commit 93dc6e7600c56182600093d7b37791089e76b25e
Author: Kaijie Chen <[email protected]>
AuthorDate: Wed Jul 23 20:06:31 2025 +0800
[fix](vcg) use "vcg cancel" as cancel message for warm up jobs (#53752)
cherry-pick #53751
---
.../src/main/java/org/apache/doris/cloud/CacheHotspotManager.java | 6 +++++-
.../org/apache/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 417f1b8d233..ed51961151e 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 class CacheHotspotManager extends MasterDaemon {
}
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 e40ee50ae58..9f0c51709e0 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 @@ public class CloudInstanceStatusChecker extends
MasterDaemon {
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
