andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert counter optimization in RoundRobin until better implementation found

Browse Source
This commit is contained in:
Dmitry Spikhalskiy 2016-11-10 21:23:52 +03:00 committed by Scott Mitchell
parent 9725a4d004
commit 4bce554c90
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resolver/src/main/java/io/netty/resolver/RoundRobinInetAddressResolver.java
View File

@ -19,6 +19,7 @@ import io.netty.util.concurrent.EventExecutor;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener; import io.netty.util.concurrent.FutureListener;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
import io.netty.util.internal.ThreadLocalRandom;
import io.netty.util.internal.UnstableApi; import io.netty.util.internal.UnstableApi;
import java.net.InetAddress; import java.net.InetAddress;
@ -27,7 +28,6 @@ import java.net.UnknownHostException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
/** /**
* A {@link NameResolver} that resolves {@link InetAddress} and force Round Robin by choosing a single address * A {@link NameResolver} that resolves {@link InetAddress} and force Round Robin by choosing a single address
@ -38,7 +38,6 @@ import java.util.concurrent.atomic.AtomicInteger;
@UnstableApi @UnstableApi
public class RoundRobinInetAddressResolver extends InetNameResolver { public class RoundRobinInetAddressResolver extends InetNameResolver {
private final NameResolver<InetAddress> nameResolver; private final NameResolver<InetAddress> nameResolver;
private final AtomicInteger index = new AtomicInteger();
/** /**
* @param executor the {@link EventExecutor} which is used to notify the listeners of the {@link Future} returned by * @param executor the {@link EventExecutor} which is used to notify the listeners of the {@link Future} returned by
@ -64,7 +63,7 @@ public class RoundRobinInetAddressResolver extends InetNameResolver {
if (numAddresses > 0) { if (numAddresses > 0) {
// if there are multiple addresses: we shall pick one by one // if there are multiple addresses: we shall pick one by one
// to support the round robin distribution // to support the round robin distribution
promise.setSuccess(inetAddresses.get(index.getAndIncrement() % numAddresses)); promise.setSuccess(inetAddresses.get(randomIndex(numAddresses)));
} else { } else {
promise.setFailure(new UnknownHostException(inetHost)); promise.setFailure(new UnknownHostException(inetHost));
} }
@ -86,7 +85,7 @@ public class RoundRobinInetAddressResolver extends InetNameResolver {
// create a copy to make sure that it's modifiable random access collection // create a copy to make sure that it's modifiable random access collection
List<InetAddress> result = new ArrayList<InetAddress>(inetAddresses); List<InetAddress> result = new ArrayList<InetAddress>(inetAddresses);
// rotate by different distance each time to force round robin distribution // rotate by different distance each time to force round robin distribution
Collections.rotate(result, index.getAndIncrement()); Collections.rotate(result, randomIndex(inetAddresses.size()));
promise.setSuccess(result); promise.setSuccess(result);
} else { } else {
promise.setSuccess(inetAddresses); promise.setSuccess(inetAddresses);
@ -97,4 +96,8 @@ public class RoundRobinInetAddressResolver extends InetNameResolver {
} }
}); });
} }
private static int randomIndex(int numAddresses) {
return numAddresses == 1 ? 0 : ThreadLocalRandom.current().nextInt(numAddresses);
}
} }