branch-4.1: [fix](job-manager) cancelTaskById should not be blocked by unrelated streaming jobs #62940#63262
Open
github-actions[bot] wants to merge 2 commits into
Open
branch-4.1: [fix](job-manager) cancelTaskById should not be blocked by unrelated streaming jobs #62940#63262github-actions[bot] wants to merge 2 commits into
github-actions[bot] wants to merge 2 commits into
Conversation
…streaming jobs (#62940) ### What problem does this PR solve? Problem Summary: `JobManager.cancelTaskById` rejects all `CANCEL TASK` calls when any streaming job exists in `jobMap`. The streaming-type check is placed before the `jobName` match, so it fires on every iteration: ```java for (T job : jobMap.values()) { if (job.getJobConfig().getExecuteType().equals(JobExecuteType.STREAMING)) { throw new JobException("streaming job not support cancel task by id"); } if (job.getJobName().equals(jobName)) { ... } } ``` If a single streaming job exists in `jobMap`, `CANCEL TASK FOR <any-non-streaming-job>` throws "streaming job not support cancel task by id" before ever matching the actual target. ### Fix Move the streaming-type check inside the `jobName` match, so it only fires when the matched job is actually a streaming job. ### Release note Fix `CANCEL TASK` on non-streaming jobs incorrectly rejected when an unrelated streaming job exists in the job map.
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
|
run buildall |
Member
|
run buildall |
Contributor
FE UT Coverage ReportIncrement line coverage |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cherry-picked from #62940