[BugFix] Fix disable base compaction with minute granularity & fe/be recover (backport #52923)

mergify[bot] commented 1 week ago

Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

[x] 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.
[x] 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:

[x] 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
[x] This is a backport pr

Bugfix cherry-pick branch check:

[x] I have checked the version labels which the pr will be auto-backported to the target branch
- [x] 3.3
- [x] 3.2
- [ ] 3.1
- [ ] 3.0
- [ ] 2.5
  This is an automatic backport of pull request #52923 done by Mergify.
  Why I'm doing:

What I'm doing:

Fixes #issue

What type of PR is this:

[x] 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.
[x] 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:

[x] 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
[x] This is a backport pr

mergify[bot] commented 1 week ago

Cherry-pick of 49f6f365385e460c5d09e316bc2bd17714dad2f4 has failed:

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

You are currently cherry-picking commit 49f6f36538.
  (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:   be/src/storage/compaction_manager.cpp
    modified:   be/src/storage/compaction_manager.h
    modified:   be/src/storage/tablet_meta.h
    modified:   be/test/storage/compaction_manager_test.cpp
    modified:   fe/fe-core/src/main/java/com/starrocks/alter/AlterJobExecutor.java
    modified:   fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
    modified:   fe/fe-core/src/main/java/com/starrocks/lake/compaction/CompactionControlScheduler.java
    modified:   fe/fe-core/src/main/java/com/starrocks/server/LocalMetastore.java
    modified:   test/sql/test_compaction_cron/R/test_compaction_cron
    modified:   test/sql/test_compaction_cron/T/test_compaction_cron

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   be/src/storage/compaction_task.cpp

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

mergify[bot] commented 1 week ago

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