From eecd5a72bd2c6d8602618f885cd70fd36b23d858 Mon Sep 17 00:00:00 2001
From: ZHANG Dapeng <zdapeng@google.com>
Date: Mon, 8 Jul 2019 15:21:52 -0700
Subject: [PATCH] xds: ignore zero-weighted locality

---
 xds/src/main/java/io/grpc/xds/XdsComms.java     |  6 ++++--
 xds/src/test/java/io/grpc/xds/XdsCommsTest.java | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/xds/src/main/java/io/grpc/xds/XdsComms.java b/xds/src/main/java/io/grpc/xds/XdsComms.java
index 762050670b..b41cf17746 100644
--- a/xds/src/main/java/io/grpc/xds/XdsComms.java
+++ b/xds/src/main/java/io/grpc/xds/XdsComms.java
@@ -251,8 +251,10 @@ final class XdsComms {
                     }
                     int localityWeight = localityLbEndpoints.getLoadBalancingWeight().getValue();
 
-                    localityEndpointsMapping.put(
-                        locality, new LocalityInfo(lbEndPoints, localityWeight));
+                    if (localityWeight != 0) {
+                      localityEndpointsMapping.put(
+                          locality, new LocalityInfo(lbEndPoints, localityWeight));
+                    }
                   }
 
                   localityEndpointsMapping = Collections.unmodifiableMap(localityEndpointsMapping);
diff --git a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
index 8c65b7e6fb..c3eb3bf522 100644
--- a/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
+++ b/xds/src/test/java/io/grpc/xds/XdsCommsTest.java
@@ -256,6 +256,15 @@ public class XdsCommsTest {
                     .setAddress("addr22").setPortValue(22))))
         .setLoadBalancingWeight(UInt32Value.of(22))
         .build();
+    Locality localityProto3 = Locality.newBuilder()
+        .setRegion("region3").setZone("zone3").setSubZone("subzone3").build();
+    LbEndpoint endpoint3 = LbEndpoint.newBuilder()
+        .setEndpoint(Endpoint.newBuilder()
+            .setAddress(Address.newBuilder()
+                .setSocketAddress(SocketAddress.newBuilder()
+                    .setAddress("addr31").setPortValue(31))))
+        .setLoadBalancingWeight(UInt32Value.of(31))
+        .build();
     DiscoveryResponse edsResponse = DiscoveryResponse.newBuilder()
         .addResources(Any.pack(ClusterLoadAssignment.newBuilder()
             .addEndpoints(LocalityLbEndpoints.newBuilder()
@@ -268,6 +277,10 @@ public class XdsCommsTest {
                 .addLbEndpoints(endpoint21)
                 .addLbEndpoints(endpoint22)
                 .setLoadBalancingWeight(UInt32Value.of(2)))
+            .addEndpoints(LocalityLbEndpoints.newBuilder()
+                .setLocality(localityProto3)
+                .addLbEndpoints(endpoint3)
+                .setLoadBalancingWeight(UInt32Value.of(0)))
             .build()))
         .setTypeUrl(EDS_TYPE_URL)
         .build();