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 bug for sqlblacklist (backport #44862) #44919

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 28, 2024

Why I'm doing:

Currently Follower FE will forward sql to Leader before verify blacklist, but every FE has its own blacklist, and this will cause two problems:

  1. if one sql is in Follower's blacklist but forward to leader, this sql can be executed
  2. For leader, because this sql is not in leader's blacklist, it will walk through every item in its blacklist which sometimes make cpu usage very high

What I'm doing:

  1. follwer FE will check blacklist first before forward to leader
  2. leader FE will not check one sql in blacklist if it is a proxy sql

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

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 #44862 done by [Mergify](https://mergify.com). ## Why I'm doing: Currently Follower FE will forward sql to Leader before verify blacklist, but every FE has its own blacklist, and this will cause two problems: 1. if one sql is in Follower's blacklist but forward to leader, this sql can be executed 2. For leader, because this sql is not in leader's blacklist, it will walk through every item in its blacklist which sometimes make cpu usage very high

What I'm doing:

  1. follwer FE will check blacklist first before forward to leader
  2. leader FE will not check one sql in blacklist if it is a proxy sql

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

Signed-off-by: before-Sunrise <[email protected]>
(cherry picked from commit 3c881b0)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java
Copy link
Contributor Author

mergify bot commented Apr 28, 2024

Cherry-pick of 3c881b0 has failed:

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

You are currently cherry-picking commit 3c881b0801.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/StmtExecutor.java

no changes added to commit (use "git add" and/or "git commit -a")

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 mergify bot added the conflicts label Apr 28, 2024
@mergify mergify bot mentioned this pull request Apr 28, 2024
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) April 28, 2024 13:23
@mergify mergify bot closed this Apr 28, 2024
auto-merge was automatically disabled April 28, 2024 13:24

Pull request was closed

Copy link
Contributor Author

mergify bot commented Apr 28, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-44862 branch April 28, 2024 13:24
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.

1 participant