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] Support fe starting with only image no bdb log (backport #54514) #54549

Merged
merged 3 commits into from
Dec 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 31, 2024

Why I'm doing:

When there is only image no bdb log, fe will start failed.

What I'm doing:

Support fe starting with only image no bdb log.

Fixes #53867

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

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

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.java
@mergify mergify bot added the conflicts label Dec 31, 2024
Copy link
Contributor Author

mergify bot commented Dec 31, 2024

Cherry-pick of d1c3335 has failed:

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

You are currently cherry-picking commit d1c333520a.
  (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/journal/bdbje/BDBEnvironment.java
	modified:   fe/fe-core/src/main/java/com/starrocks/server/NodeMgr.java
	modified:   fe/fe-core/src/test/java/com/starrocks/journal/bdbje/BDBEnvironmentTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/journal/bdbje/BDBJEJournalTest.java
	modified:   fe/fe-core/src/test/java/com/starrocks/journal/bdbje/BDBJournalCursorTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/server/GlobalStateMgr.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 31, 2024 06:30
@mergify mergify bot closed this Dec 31, 2024
auto-merge was automatically disabled December 31, 2024 06:31

Pull request was closed

Copy link
Contributor Author

mergify bot commented Dec 31, 2024

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

@andyziye andyziye reopened this Dec 31, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) December 31, 2024 06:36
Signed-off-by: xiangguangyxg <[email protected]>
Signed-off-by: xiangguangyxg <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 8d5bed9 into branch-3.3 Dec 31, 2024
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.3/pr-54514 branch December 31, 2024 12:35
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