Skip to content

[fix](vcg) use "vcg cancel" as cancel message for warm up jobs #53752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Jul 23, 2025
Merged

[fix](vcg) use "vcg cancel" as cancel message for warm up jobs #53752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/cloud/CacheHotspotManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudInstanceStatusChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private void cancelCacheJobs(ComputeGroup vcgInFe, List<String> 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) {
Expand Down
Loading