Skip to content
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

Jump to bottom

[BugFix] Support MERGED state for task run #45598

Merged
merged 1 commit into from
May 15, 2024
Merged

[BugFix] Support MERGED state for task run #45598

merged 1 commit into from
May 15, 2024

Conversation

LiShuMing
Copy link
Contributor

@LiShuMing LiShuMing commented May 14, 2024 •
edited

Why I'm doing:

  • Problem1: When a task run is merged, we cannot distinguish it between task runs from RUNNING to SUCCESS.
  • Problem2: Task run may not be merged if it's triggered by mv's event-trigger refresh mode.

What I'm doing:

  • Add MERGED State for TaskRun
  • Change isMergeRedudant as true for mv's task run which means it can be merged in the pending queue.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

@LiShuMing LiShuMing requested a review from a team as a code owner May 14, 2024 10:53
@LiShuMing
Support MERGED state for task run
90460d4 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
@LiShuMing LiShuMing force-pushed the fix/main/support_merge_task_run_state branch from 1df8bd0 to 90460d4 Compare May 15, 2024 02:03
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 15, 2024

Quality Gate Passed Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@github-actions GitHub Actions
Copy link

[FE Incremental Coverage Report]

✅ pass : 23 / 25 (92.00%)

file detail

path covered_line new_line coverage not_covered_line_detail
🔵 com/starrocks/scheduler/TaskBuilder.java 0 1 00.00% [273]
🔵 com/starrocks/scheduler/TaskManager.java 8 9 88.89% [296]
🔵 com/starrocks/scheduler/TaskRunBuilder.java 1 1 100.00% []
🔵 com/starrocks/scheduler/TaskRunManager.java 1 1 100.00% []
🔵 com/starrocks/scheduler/Constants.java 8 8 100.00% []
🔵 com/starrocks/alter/AlterMVJobExecutor.java 1 1 100.00% []
🔵 com/starrocks/scheduler/ExecuteOption.java 3 3 100.00% []
🔵 com/starrocks/load/pipe/Pipe.java 1 1 100.00% []

@github-actions GitHub Actions
Copy link

[BE Incremental Coverage Report]

✅ pass : 0 / 0 (0%)

@Astralidea Astralidea enabled auto-merge (squash) May 15, 2024 06:14
@Astralidea Astralidea merged commit 34de882 into StarRocks:main May 15, 2024
49 checks passed
@github-actions GitHub Actions
Copy link

@Mergifyio backport branch-3.3

@github-actions GitHub Actions
Copy link

@Mergifyio backport branch-3.2

@github-actions GitHub Actions
Copy link

@Mergifyio backport branch-3.1

@github-actions github-actions bot removed the 3.1 label May 15, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented May 15, 2024 •
edited

backport branch-3.3

✅ Backports have been created

@mergify Mergify
Copy link
Contributor

mergify bot commented May 15, 2024 •
edited

backport branch-3.2

✅ Backports have been created

@mergify Mergify
Copy link
Contributor

mergify bot commented May 15, 2024 •
edited

backport branch-3.1

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request May 15, 2024
@LiShuMing @mergify
[BugFix] Support MERGED state for task run (#45598)
036fe12 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/scheduler/TaskManager.java
@mergify mergify bot mentioned this pull request May 15, 2024
Merged
42 tasks
mergify bot pushed a commit that referenced this pull request May 15, 2024
@LiShuMing @mergify
[BugFix] Support MERGED state for task run (#45598)
5429c07 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/scheduler/Constants.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/ExecuteOption.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/TaskManager.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/persist/MVTaskRunExtraMessage.java
#	fe/fe-core/src/test/java/com/starrocks/scheduler/TaskManagerTest.java
@mergify mergify bot mentioned this pull request May 15, 2024
Merged
42 tasks
mergify bot pushed a commit that referenced this pull request May 15, 2024
@LiShuMing @mergify
[BugFix] Support MERGED state for task run (#45598)
7737ed9 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/alter/AlterMVJobExecutor.java
#	fe/fe-core/src/main/java/com/starrocks/load/pipe/Pipe.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/Constants.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/ExecuteOption.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/TaskBuilder.java
#	fe/fe-core/src/main/java/com/starrocks/scheduler/TaskManager.java
#	fe/fe-core/src/test/java/com/starrocks/scheduler/TaskManagerTest.java
@mergify mergify bot mentioned this pull request May 15, 2024
Merged
42 tasks
LiShuMing added a commit that referenced this pull request May 16, 2024
@LiShuMing
[BugFix] Support MERGED state for task run (#45598)
4d0965b 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)
wanpengfei-git pushed a commit that referenced this pull request May 16, 2024
@mergify @LiShuMing
[BugFix] Support MERGED state for task run (backport #45598) (#45656)
8c2ee95 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
Co-authored-by: shuming.li <ming.moriarty@gmail.com>
LiShuMing added a commit that referenced this pull request May 17, 2024
@LiShuMing
[BugFix] Support MERGED state for task run (#45598)
0352fbc 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)
wanpengfei-git pushed a commit that referenced this pull request May 17, 2024
@mergify @LiShuMing
[BugFix] Support MERGED state for task run (backport #45598) (#45657)
f0c78c2 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
Co-authored-by: shuming.li <ming.moriarty@gmail.com>
LiShuMing added a commit that referenced this pull request May 17, 2024
@LiShuMing
[BugFix] Support MERGED state for task run (#45598)
d730793 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
(cherry picked from commit 34de882)
wanpengfei-git pushed a commit that referenced this pull request May 17, 2024
@mergify @LiShuMing
[BugFix] Support MERGED state for task run (backport #45598) (#45658)
26e8435 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
Co-authored-by: shuming.li <ming.moriarty@gmail.com>
node pushed a commit to vivo/starrocks that referenced this pull request May 17, 2024
@LiShuMing @node
[BugFix] Support MERGED state for task run (StarRocks#45598)
8fa3511 
Signed-off-by: shuming.li <ming.moriarty@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@starrocks-cr starrocks-cr[bot] starrocks-cr left review comments

@satanson satanson satanson approved these changes

@Astralidea Astralidea Astralidea approved these changes

@HangyuanLiu HangyuanLiu HangyuanLiu approved these changes

Assignees

@LiShuMing LiShuMing

Labels
3.1-merged 3.2-merged 3.3-merged
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LiShuMing @satanson @Astralidea @HangyuanLiu