From 0781d2ca75cc428fe2db3913f78496112c82f203 Mon Sep 17 00:00:00 2001
From: sanjaypujare <sanjaypujare@users.noreply.github.com>
Date: Mon, 16 Nov 2020 09:25:18 -0800
Subject: [PATCH] xds: use 0.0.0.0 in the resource query for LDS (#7624)

---
 .../java/io/grpc/xds/XdsClientWrapperForServerSds.java   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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