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] multiple sys_log_to_console=true entry in fe.conf every time… (backport #45851) #51160

Merged
merged 2 commits into from
Sep 19, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 19, 2024

Why I'm doing:

multiple sys_log_to_console=true entry in fe.conf every time fe is started with --logconsole option

What I'm doing:

fe.conf should have only single entry sys_log_to_console=true

Fixes #45850

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 #45851 done by [Mergify](https://mergify.com).

Why I'm doing:

multiple sys_log_to_console=true entry in fe.conf every time fe is started with --logconsole option

What I'm doing:

fe.conf should have only single entry sys_log_to_console=true

Fixes #45850

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

#45851)

Signed-off-by: Rohit Satardekar <[email protected]>
(cherry picked from commit da1a80d)

# Conflicts:
#	bin/start_fe.sh
@mergify mergify bot added the conflicts label Sep 19, 2024
Copy link
Contributor Author

mergify bot commented Sep 19, 2024

Cherry-pick of da1a80d has failed:

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

You are currently cherry-picking commit da1a80d47f.
  (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/common/Config.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bin/start_fe.sh

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

Copy link
Contributor Author

mergify bot commented Sep 19, 2024

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

@mergify mergify bot closed this Sep 19, 2024
@mergify mergify bot deleted the mergify/bp/branch-3.2/pr-45851 branch September 19, 2024 09:06
@kevincai kevincai restored the mergify/bp/branch-3.2/pr-45851 branch September 19, 2024 09:09
@kevincai kevincai reopened this Sep 19, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) September 19, 2024 09:09
Signed-off-by: Kevin Xiaohua Cai <[email protected]>
@wanpengfei-git wanpengfei-git merged commit 55d5cf2 into branch-3.2 Sep 19, 2024
28 of 29 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.2/pr-45851 branch September 19, 2024 09:41
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