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

xds: use 0.0.0.0 in the resource query for LDS (#7624)

This commit is contained in:
sanjaypujare 2020-11-16 09:25:18 -08:00 committed by GitHub
parent a43ae54c59
commit 0781d2ca75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xds/src/main/java/io/grpc/xds/XdsClientWrapperForServerSds.java
View File

@ -37,7 +37,6 @@ import io.netty.channel.epoll.Epoll;
import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.epoll.EpollEventLoopGroup;
import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.DefaultThreadFactory;
import java.io.IOException; import java.io.IOException;
import java.net.Inet4Address;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
@ -110,12 +109,6 @@ public final class XdsClientWrapperForServerSds {
} }
Node node = bootstrapInfo.getNode(); Node node = bootstrapInfo.getNode();
timeService = SharedResourceHolder.get(timeServiceResource); timeService = SharedResourceHolder.get(timeServiceResource);
String instanceIp;
try {
instanceIp = Inet4Address.getLocalHost().getHostAddress();
} catch (UnknownHostException e) {
instanceIp = "0.0.0.0";
}
XdsClient xdsClientImpl = XdsClient xdsClientImpl =
new ServerXdsClient( new ServerXdsClient(
channel, channel,
@ -124,7 +117,7 @@ public final class XdsClientWrapperForServerSds {
new ExponentialBackoffPolicy.Provider(), new ExponentialBackoffPolicy.Provider(),
GrpcUtil.STOPWATCH_SUPPLIER, GrpcUtil.STOPWATCH_SUPPLIER,
experimentalNewServerApiEnvVar, experimentalNewServerApiEnvVar,
instanceIp, "0.0.0.0",
bootstrapInfo.getGrpcServerResourceId()); bootstrapInfo.getGrpcServerResourceId());
start(xdsClientImpl); start(xdsClientImpl);
} }