grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Handle negative random numbers in c2p resolver 

This was noticed because Mockito can't mock Random in Java 17, so it was
replaced with actual Random. But when doing that change it exposed that
negative numbers would cause the id to have a double '-'.
This commit is contained in:
Eric Anderson 2022-01-18 12:38:04 -08:00 committed by GitHub
parent d1e0be6919
commit 2c5a9e2aed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java
View File

@ -175,7 +175,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
private ImmutableMap<String, ?> generateBootstrap(String zone, boolean supportIpv6) { private ImmutableMap<String, ?> generateBootstrap(String zone, boolean supportIpv6) {
ImmutableMap.Builder<String, Object> nodeBuilder = ImmutableMap.builder(); ImmutableMap.Builder<String, Object> nodeBuilder = ImmutableMap.builder();
nodeBuilder.put("id", "C2P-" + rand.nextInt()); nodeBuilder.put("id", "C2P-" + (rand.nextInt() & Integer.MAX_VALUE));
if (!zone.isEmpty()) { if (!zone.isEmpty()) {
nodeBuilder.put("locality", ImmutableMap.of("zone", zone)); nodeBuilder.put("locality", ImmutableMap.of("zone", zone));
} }

8
xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java
View File

@ -104,8 +104,7 @@ public class GoogleCloudToProdNameResolverTest {
@Mock @Mock
private NameResolver.Listener2 mockListener; private NameResolver.Listener2 mockListener;
@Mock private Random random = new Random(1);
private Random mockRandom;
@Captor @Captor
private ArgumentCaptor<Status> errorCaptor; private ArgumentCaptor<Status> errorCaptor;
private boolean originalIsOnGcp; private boolean originalIsOnGcp;
@ -114,7 +113,6 @@ public class GoogleCloudToProdNameResolverTest {
@Before @Before
public void setUp() { public void setUp() {
when(mockRandom.nextInt()).thenReturn(123456789);
nsRegistry.register(new FakeNsProvider("dns")); nsRegistry.register(new FakeNsProvider("dns"));
nsRegistry.register(new FakeNsProvider("xds")); nsRegistry.register(new FakeNsProvider("xds"));
originalIsOnGcp = GoogleCloudToProdNameResolver.isOnGcp; originalIsOnGcp = GoogleCloudToProdNameResolver.isOnGcp;
@ -146,7 +144,7 @@ public class GoogleCloudToProdNameResolverTest {
} }
}; };
resolver = new GoogleCloudToProdNameResolver( resolver = new GoogleCloudToProdNameResolver(
TARGET_URI, args, fakeExecutorResource, mockRandom, fakeXdsClientPoolFactory, TARGET_URI, args, fakeExecutorResource, random, fakeXdsClientPoolFactory,
nsRegistry.asFactory()); nsRegistry.asFactory());
resolver.setHttpConnectionProvider(httpConnections); resolver.setHttpConnectionProvider(httpConnections);
} }
@ -183,7 +181,7 @@ public class GoogleCloudToProdNameResolverTest {
Map<String, ?> bootstrap = fakeXdsClientPoolFactory.bootstrapRef.get(); Map<String, ?> bootstrap = fakeXdsClientPoolFactory.bootstrapRef.get();
Map<String, ?> node = (Map<String, ?>) bootstrap.get("node"); Map<String, ?> node = (Map<String, ?>) bootstrap.get("node");
assertThat(node).containsExactly( assertThat(node).containsExactly(
"id", "C2P-123456789", "id", "C2P-991614323",
"locality", ImmutableMap.of("zone", ZONE), "locality", ImmutableMap.of("zone", ZONE),
"metadata", ImmutableMap.of("TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true)); "metadata", ImmutableMap.of("TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true));
Map<String, ?> server = Iterables.getOnlyElement( Map<String, ?> server = Iterables.getOnlyElement(