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

[Enhancement] Trigger new starmgr image in alter system create image for shared-data mode (backport #54370) #54389

Merged
merged 2 commits into from
Dec 27, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 26, 2024

Why I'm doing:

Alter system create image only created FE image not starmgr image in shared-data mode.

What I'm doing:

Trigger new starmgr image in alter system create image in shared-data mode

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

…for shared-data mode (#54370)

Signed-off-by: xiangguangyxg <[email protected]>
(cherry picked from commit 3f07430)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/alter/SystemHandler.java
#	fe/fe-core/src/main/java/com/starrocks/staros/StarMgrServer.java
@mergify mergify bot added the conflicts label Dec 26, 2024
Copy link
Contributor Author

mergify bot commented Dec 26, 2024

Cherry-pick of 3f07430 has failed:

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

You are currently cherry-picking commit 3f0743032b.
  (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/staros/BDBJEJournalSystem.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/alter/SystemHandler.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/staros/StarMgrServer.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

@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 26, 2024 08:33
@mergify mergify bot closed this Dec 26, 2024
auto-merge was automatically disabled December 26, 2024 08:33

Pull request was closed

Copy link
Contributor Author

mergify bot commented Dec 26, 2024

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

@andyziye andyziye reopened this Dec 26, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 26, 2024 11:23
Signed-off-by: xiangguangyxg <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 3387230 into branch-3.2 Dec 27, 2024
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-54370 branch December 27, 2024 02:10
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.

4 participants