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.

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

RandomRule policy modification #393

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −3
Open

RandomRule policy modification #393

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
7 changes: 4 additions & 3 deletions ribbon-loadbalancer/src/main/java/com/netflix/loadbalancer/RandomRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,18 @@ public Server choose(ILoadBalancer lb, Object key) {
List<Server> upList = lb.getReachableServers();
List<Server> allList = lb.getAllServers();

int upCount = upList.size();
int serverCount = allList.size();
if (serverCount == 0) {
if (serverCount == 0 || upCount == 0) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check upCount isn't sufficient ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the server that is reachable is down, then the upCount is 0

/*
* No servers. End regardless of pass, because subsequent passes
* No servers or No servers available. End regardless of pass, because subsequent passes
* only get more restrictive.
*/
return null;
}

int index = chooseRandomInt(serverCount);
server = upList.get(index);
server = allList.get(index);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Server should not be selected on upList ?

int index = chooseRandomInt(upCount);
server = upList.get(index);

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, server should be selected on upList, but the index should not be chosen from serverCount, it may be greater than upList.size()


if (server == null) {
/*
Expand Down