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 match of source ip for resource group (backport #47732) #47808

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 3, 2024

Why I'm doing:

What I'm doing:

Fixes #47437.

  1. Match
    SubnetUtils::isInRange doesn't consider the broadcast and network address as a usable endpoint by default. As a result, 127.0.0.1 cannot matched 127.0.0.1/32.

  2. Weight
    The weight of sourceIP of a resource group classifier is 1 + cidrPrefixLength/64. However, we calculate cidrPrefixLength by Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32, which should be Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31.

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 #47732 done by [Mergify](https://mergify.com). ## Why I'm doing:

What I'm doing:

Fixes #47437.

  1. Match
    SubnetUtils::isInRange doesn't consider the broadcast and network address as a usable endpoint by default. As a result, 127.0.0.1 cannot matched 127.0.0.1/32.

  2. Weight
    The weight of sourceIP of a resource group classifier is 1 + cidrPrefixLength/64. However, we calculate cidrPrefixLength by Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32, which should be Long.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31.

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: zihe.liu <[email protected]>
(cherry picked from commit 43c1174)

# Conflicts:
#	fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupClassifier.java
#	fe/fe-core/src/main/java/com/starrocks/common/util/NetUtils.java
#	fe/fe-core/src/test/java/com/starrocks/analysis/ResourceGroupStmtTest.java
@mergify mergify bot added the conflicts label Jul 3, 2024
Copy link
Contributor Author

mergify bot commented Jul 3, 2024

Cherry-pick of 43c1174 has failed:

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

You are currently cherry-picking commit 43c117440a.
  (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:
	new file:   fe/fe-core/src/test/java/com/starrocks/catalog/ResourceGroupClassifierTest.java
	new file:   fe/fe-core/src/test/java/com/starrocks/common/util/NetUtilsTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/main/java/com/starrocks/catalog/ResourceGroupClassifier.java
	both modified:   fe/fe-core/src/main/java/com/starrocks/common/util/NetUtils.java
	both modified:   fe/fe-core/src/test/java/com/starrocks/analysis/ResourceGroupStmtTest.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

Copy link
Contributor Author

mergify bot commented Jul 3, 2024

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

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-47732 branch July 3, 2024 09:29
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