Skip to content

[#4520]ratioCeiling defaults to 100-ratio #4523

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.

Sign up for GitHub

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

Merged
liubao68 merged 1 commit into from
Sep 14, 2024
Merged

[#4520]ratioCeiling defaults to 100-ratio #4523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ private int getRatio() {
.getIntProperty(CONFIG_RATIO, 30).get();
}

private int getRatioCeiling() {
private int getRatioCeiling(int defaultValue) {
return DynamicPropertyFactory.getInstance()
.getIntProperty(CONFIG_RATIO_CEILING, 70).get();
.getIntProperty(CONFIG_RATIO_CEILING, defaultValue).get();
}

@Override
Expand All @@ -74,7 +74,7 @@ public List<ServiceCombServer> getFilteredListOfServers(List<ServiceCombServer>
});

int ratio = getRatio();
int ratioCeiling = getRatioCeiling();
int ratioCeiling = getRatioCeiling(100 - ratio);

if (hasEnoughMembers(servers.size(), instancesRegionAndAZMatch.size(), ratio, ratioCeiling)) {
return instancesRegionAndAZMatch;
Expand Down
1 change: 1 addition & 0 deletions .../test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public void tearDown() {
@Test
public void test_not_enough_instance() {
ArchaiusUtils.setProperty(ZoneAwareDiscoveryFilter.CONFIG_RATIO, 50);
ArchaiusUtils.setProperty(ZoneAwareDiscoveryFilter.CONFIG_RATIO_CEILING, 70);
ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();

// set up data
Expand Down