Skip to content

branch-4.1: [fix](job-manager) cancelTaskById should not be blocked by unrelated streaming jobs #62940#63262

Merged
yiguolei merged 2 commits into
branch-4.1from
auto-pick-62940-branch-4.1
May 20, 2026
Merged

branch-4.1: [fix](job-manager) cancelTaskById should not be blocked by unrelated streaming jobs #62940#63262
yiguolei merged 2 commits into
branch-4.1from
auto-pick-62940-branch-4.1

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot commented May 14, 2026

Cherry-picked from #62940

@github-actions github-actions Bot requested a review from yiguolei as a code owner May 14, 2026 15:20
@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 14, 2026

Thank you for your contribution to Apache Doris.
Don't know what should be done next? See How to process your PR.

Please clearly describe your PR:

  1. What problem was fixed (it's best to include specific error reporting information). How it was fixed.
  2. Which behaviors were modified. What was the previous behavior, what is it now, why was it modified, and what possible impacts might there be.
  3. What features were added. Why was this function added?
  4. Which code was refactored and why was this part of the code refactored?
  5. Which functions were optimized and what is the difference before and after the optimization?

@hello-stephen hello-stephen reopened this May 14, 2026
@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 14, 2026

run buildall

1 similar comment
@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 15, 2026

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 15, 2026

FE UT Coverage Report

Increment line coverage 100.00% (2/2) 🎉
Increment coverage report
Complete coverage report

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 15, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/62) 🎉
Increment coverage report
Complete coverage report

@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 15, 2026

run nonConcurrent

2 similar comments
@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 15, 2026

run nonConcurrent

@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 15, 2026

run nonConcurrent

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 15, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/83) 🎉
Increment coverage report
Complete coverage report

@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 15, 2026

run nonConcurrent

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 15, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/83) 🎉
Increment coverage report
Complete coverage report

1 similar comment
@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 15, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/83) 🎉
Increment coverage report
Complete coverage report

JNSimba added 2 commits May 19, 2026 10:19
@JNSimba
[fix](job-manager) cancelTaskById should not be blocked by unrelated …
6df24b4 
…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.
@JNSimba
[fix](test) add missing Mockito import in JobManagerTest for branch-4.1
38f06e1
@JNSimba JNSimba force-pushed the auto-pick-62940-branch-4.1 branch from c540492 to 38f06e1 Compare May 19, 2026 02:19
@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 19, 2026

run buildall

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 19, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/2) 🎉
Increment coverage report
Complete coverage report

@JNSimba
Copy link
Copy Markdown
Member

JNSimba commented May 19, 2026

run p0

@hello-stephen
Copy link
Copy Markdown
Contributor

hello-stephen commented May 19, 2026

FE Regression Coverage Report

Increment line coverage 0.00% (0/2) 🎉
Increment coverage report
Complete coverage report

@yiguolei yiguolei merged commit 443bcba into branch-4.1 May 20, 2026
28 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yiguolei yiguolei yiguolei approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hello-stephen @JNSimba @yiguolei