Closed mergify[bot] closed 2 days ago
Cherry-pick of 43c117440af1d2646f88dabadd7b4a8b9337e14f 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
@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr
Why I'm doing:
What I'm doing:
Fixes #47437.
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 matched127.0.0.1/32
.Weight The weight of
sourceIP
of a resource group classifier is1 + cidrPrefixLength/64
. However, we calculatecidrPrefixLength
byLong.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32
, which should beLong.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31
.What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist:
Bugfix cherry-pick branch check:
This is an automatic backport of pull request #47732 done by Mergify.
Why I'm doing:
What I'm doing:
Fixes #47437.
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 matched127.0.0.1/32
.Weight The weight of
sourceIP
of a resource group classifier is1 + cidrPrefixLength/64
. However, we calculatecidrPrefixLength
byLong.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 32
, which should beLong.numberOfLeadingZeros(subnetUtils.getInfo().getAddressCountLong()) - 31
.What type of PR is this:
Does this PR entail a change in behavior?
If yes, please specify the type of change:
Checklist: