-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…48173) CP from #47732. ## 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`. Signed-off-by: zihe.liu <[email protected]>
- Loading branch information
Showing
6 changed files
with
158 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
fe/fe-core/src/test/java/com/starrocks/catalog/ResourceGroupClassifierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // Copyright 2021-present StarRocks, Inc. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.starrocks.catalog; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.assertj.core.api.Assertions.within; | ||
|
|
||
| public class ResourceGroupClassifierTest { | ||
| @Test | ||
| public void testSourceIP() { | ||
| ResourceGroupClassifier classifier = new ResourceGroupClassifier(); | ||
|
|
||
| classifier.setSourceIp("192.168.0.1/32"); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.1")).isTrue(); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.2")).isFalse(); | ||
|
|
||
| classifier.setSourceIp("192.168.0.1/31"); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.1")).isTrue(); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.2")).isFalse(); | ||
|
|
||
| classifier.setSourceIp("192.168.0.1/30"); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.1")).isTrue(); | ||
| assertThat(classifier.isVisible("user", null, "192.168.0.2")).isTrue(); | ||
| assertThat(classifier.isVisible("user", null, "192.168.1.1")).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testWeight() { | ||
| ResourceGroupClassifier classifier = new ResourceGroupClassifier(); | ||
|
|
||
| for (int i = 0; i <= 32; i++) { | ||
| classifier.setSourceIp("192.168.0.1/" + i); | ||
| assertThat(classifier.weight()).isCloseTo(1 + i / 64., within(1e-5)); | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
fe/fe-core/src/test/java/com/starrocks/common/util/NetUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2021-present StarRocks, Inc. All rights reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // https://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.starrocks.common.util; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class NetUtilsTest { | ||
| @Test | ||
| public void testGetCidrPrefixLength() { | ||
| for (int i = 0; i <= 32; i++) { | ||
| String addr = "192.168.0.1/" + i; | ||
| assertThat(NetUtils.getCidrPrefixLength(addr)).isEqualTo(i); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testIsIPInSubnet() { | ||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "192.168.0.1/32")).isTrue(); | ||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "192.168.1.1/32")).isFalse(); | ||
|
|
||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "192.168.0.1/24")).isTrue(); | ||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "192.168.0.2/24")).isTrue(); | ||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "192.168.1.0/24")).isFalse(); | ||
|
|
||
| assertThat(NetUtils.isIPInSubnet("192.168.0.1", "10.0.0.0/8")).isFalse(); | ||
| } | ||
| } |