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.

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

[BugFix] Fix dynamic partition table unexpectly stop scheduling (backport #45235) #45350

Merged
merged 2 commits into from
May 9, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 9, 2024

Periodically re-collect all the schedulable tables and put them into scheduling.
Also refactor some code and add more logging to make it easier to debug problems.

Fixes SR-27131

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

This is an automatic backport of pull request #45235 done by [Mergify](https://mergify.com). Periodically re-collect all the schedulable tables and put them into scheduling. Also refactor some code and add more logging to make it easier to debug problems.

Fixes SR-27131

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

…port #45235) (#45313)

Signed-off-by: yiming <[email protected]>
Signed-off-by: Dejun Xia <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: yiming <[email protected]>
(cherry picked from commit 5ef58ac)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java
#	fe/fe-core/src/main/java/com/starrocks/common/util/DynamicPartitionUtil.java
#	fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
@mergify mergify bot added the conflicts label May 9, 2024
Copy link
Contributor Author

mergify bot commented May 9, 2024

Cherry-pick of 5ef58ac has failed:

On branch mergify/bp/branch-2.5/pr-45313
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 5ef58ac7d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/Database.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/DynamicPartitionProperty.java
	modified:   fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
	modified:   fe/fe-core/src/main/java/com/starrocks/common/proc/CurrentQueryBackendInstanceProcDir.java
	modified:   fe/fe-core/src/main/java/com/starrocks/qe/ShowExecutor.java
	modified:   fe/fe-core/src/main/java/com/starrocks/sql/ast/ShowDynamicPartitionStmt.java
	modified:   fe/fe-core/src/test/java/com/starrocks/alter/AlterTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/alter/SchemaChangeJobV2Test.java
	modified:   fe/fe-core/src/test/java/com/starrocks/catalog/TablePropertyTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/clone/DynamicPartitionScheduler.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/common/util/DynamicPartitionUtil.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@CLAassistant
Copy link

CLAassistant commented May 9, 2024

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ nshangyiming
❌ mergify[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 9, 2024 08:08
@mergify mergify bot closed this May 9, 2024
auto-merge was automatically disabled May 9, 2024 08:08

Pull request was closed

Copy link
Contributor Author

mergify bot commented May 9, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@nshangyiming nshangyiming changed the title [BugFix] Fix dynamic partition table unexpectly stop scheduling (backport #45235) (backport #45313) [BugFix] Fix dynamic partition table unexpectly stop scheduling (backport #45235) May 9, 2024
@nshangyiming nshangyiming reopened this May 9, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 9, 2024 08:09
@nshangyiming nshangyiming self-assigned this May 9, 2024
Signed-off-by: Dejun Xia <[email protected]>
Copy link

sonarqubecloud bot commented May 9, 2024

@wanpengfei-git wanpengfei-git merged commit 5901f17 into branch-2.5 May 9, 2024
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-45313 branch May 9, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants