Skip to content

Commit 38f968f

Browse files
larry-safranlarry-safran
authored
Have EDS resource parse the additional addresses from envoy message (#11011)
* Have EDS resource parse the additional addresses from envoy message * Update respositories.bzl to point to current grpc-proto instead of a 2021 version. * Update respositories.bzl to point to recent cncf/xds and envoyproxy/data-plane-api * Add cncf_upda to repositories.bzl
1 parent 0e31ac9 commit 38f968f

File tree

3 files changed

+95
-16
lines changed

3 files changed

+95
-16
lines changed

‎repositories.bzl‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS = {
8585

8686
def grpc_java_repositories():
8787
"""Imports dependencies for grpc-java."""
88+
if not native.existing_rule("com_github_cncf_udpa"):
89+
http_archive(
90+
name = "com_github_cncf_udpa",
91+
sha256 = "0d33b83f8c6368954e72e7785539f0d272a8aba2f6e2e336ed15fd1514bc9899",
92+
strip_prefix = "xds-e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7",
93+
urls = [
94+
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz",
95+
"https://github.com/cncf/xds/archive/e9ce68804cb4e64cab5a52e3c8baf840d4ff87b7.tar.gz",
96+
],
97+
)
8898
if not native.existing_rule("com_github_cncf_xds"):
8999
http_archive(
90100
name = "com_github_cncf_xds",
@@ -130,10 +140,11 @@ def grpc_java_repositories():
130140
if not native.existing_rule("envoy_api"):
131141
http_archive(
132142
name = "envoy_api",
133-
sha256 = "b426904abf51ba21dd8947a05694bb3c861d6f5e436e4673e74d7d7bfb6d3188",
134-
strip_prefix = "data-plane-api-268824e4eee3d7770a347a5dc5aaddc0b1b14e24",
143+
sha256 = "fff067a5d6d776fc88549b5dd4773a6f8f0187b26a859de8b29bd4226a28ee63",
144+
strip_prefix = "data-plane-api-9d6ffa70677c4dbf23f6ed569676206c4e2edff4",
135145
urls = [
136-
"https://github.com/envoyproxy/data-plane-api/archive/268824e4eee3d7770a347a5dc5aaddc0b1b14e24.tar.gz",
146+
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9d6ffa70677c4dbf23f6ed569676206c4e2edff4.tar.gz",
147+
"https://github.com/envoyproxy/data-plane-api/archive/9d6ffa70677c4dbf23f6ed569676206c4e2edff4.tar.gz",
137148
],
138149
)
139150

@@ -160,7 +171,7 @@ def com_google_protobuf_javalite():
160171
def io_grpc_grpc_proto():
161172
http_archive(
162173
name = "io_grpc_grpc_proto",
163-
sha256 = "464e97a24d7d784d9c94c25fa537ba24127af5aae3edd381007b5b98705a0518",
164-
strip_prefix = "grpc-proto-08911e9d585cbda3a55eb1dcc4b99c89aebccff8",
165-
urls = ["https://github.com/grpc/grpc-proto/archive/08911e9d585cbda3a55eb1dcc4b99c89aebccff8.zip"],
174+
sha256 = "729ac127a003836d539ed9da72a21e094aac4c4609e0481d6fc9e28a844e11af",
175+
strip_prefix = "grpc-proto-4f245d272a28a680606c0739753506880cf33b5f",
176+
urls = ["https://github.com/grpc/grpc-proto/archive/4f245d272a28a680606c0739753506880cf33b5f.zip"],
166177
)

‎xds/src/main/java/io/grpc/xds/XdsEndpointResource.java‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020

2121
import com.google.common.annotations.VisibleForTesting;
2222
import com.google.common.base.MoreObjects;
23-
import com.google.common.collect.ImmutableList;
2423
import com.google.protobuf.Message;
24+
import io.envoyproxy.envoy.config.core.v3.Address;
25+
import io.envoyproxy.envoy.config.core.v3.HealthStatus;
2526
import io.envoyproxy.envoy.config.endpoint.v3.ClusterLoadAssignment;
27+
import io.envoyproxy.envoy.config.endpoint.v3.Endpoint;
2628
import io.envoyproxy.envoy.type.v3.FractionalPercent;
2729
import io.grpc.EquivalentAddressGroup;
30+
import io.grpc.internal.GrpcUtil;
2831
import io.grpc.xds.Endpoints.DropOverload;
2932
import io.grpc.xds.Endpoints.LocalityLbEndpoints;
3033
import io.grpc.xds.XdsEndpointResource.EdsUpdate;
@@ -46,6 +49,8 @@
4649
class XdsEndpointResource extends XdsResourceType<EdsUpdate> {
4750
static final String ADS_TYPE_URL_EDS =
4851
"type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment";
52+
static final String GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS =
53+
"grpc.experimental.xdsDualstackEndpoints";
4954

5055
private static final XdsEndpointResource instance = new XdsEndpointResource();
5156

@@ -95,6 +100,10 @@ protected EdsUpdate doParse(Args args, Message unpackedMessage) throws ResourceI
95100
return processClusterLoadAssignment((ClusterLoadAssignment) unpackedMessage);
96101
}
97102

103+
private static boolean isEnabledXdsDualStack() {
104+
return GrpcUtil.getFlag(GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS, false);
105+
}
106+
98107
private static EdsUpdate processClusterLoadAssignment(ClusterLoadAssignment assignment)
99108
throws ResourceInvalidException {
100109
Map<Integer, Set<Locality>> priorities = new HashMap<>();
@@ -190,22 +199,30 @@ static StructOrError<LocalityLbEndpoints> parseLocalityLbEndpoints(
190199
if (!endpoint.hasEndpoint() || !endpoint.getEndpoint().hasAddress()) {
191200
return StructOrError.fromError("LbEndpoint with no endpoint/address");
192201
}
193-
io.envoyproxy.envoy.config.core.v3.SocketAddress socketAddress =
194-
endpoint.getEndpoint().getAddress().getSocketAddress();
195-
InetSocketAddress addr =
196-
new InetSocketAddress(socketAddress.getAddress(), socketAddress.getPortValue());
197-
boolean isHealthy =
198-
endpoint.getHealthStatus() == io.envoyproxy.envoy.config.core.v3.HealthStatus.HEALTHY
199-
|| endpoint.getHealthStatus()
200-
== io.envoyproxy.envoy.config.core.v3.HealthStatus.UNKNOWN;
202+
List<java.net.SocketAddress> addresses = new ArrayList<>();
203+
addresses.add(getInetSocketAddress(endpoint.getEndpoint().getAddress()));
204+
if (isEnabledXdsDualStack()) {
205+
for (Endpoint.AdditionalAddress additionalAddress
206+
: endpoint.getEndpoint().getAdditionalAddressesList()) {
207+
addresses.add(getInetSocketAddress(additionalAddress.getAddress()));
208+
}
209+
}
210+
boolean isHealthy = (endpoint.getHealthStatus() == HealthStatus.HEALTHY)
211+
|| (endpoint.getHealthStatus() == HealthStatus.UNKNOWN);
201212
endpoints.add(Endpoints.LbEndpoint.create(
202-
new EquivalentAddressGroup(ImmutableList.<java.net.SocketAddress>of(addr)),
213+
new EquivalentAddressGroup(addresses),
203214
endpoint.getLoadBalancingWeight().getValue(), isHealthy));
204215
}
205216
return StructOrError.fromStruct(Endpoints.LocalityLbEndpoints.create(
206217
endpoints, proto.getLoadBalancingWeight().getValue(), proto.getPriority()));
207218
}
208219

220+
private static InetSocketAddress getInetSocketAddress(Address address) {
221+
io.envoyproxy.envoy.config.core.v3.SocketAddress socketAddress = address.getSocketAddress();
222+
223+
return new InetSocketAddress(socketAddress.getAddress(), socketAddress.getPortValue());
224+
}
225+
209226
static final class EdsUpdate implements ResourceUpdate {
210227
final String clusterName;
211228
final Map<Locality, LocalityLbEndpoints> localityLbEndpointsMap;

‎xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static io.envoyproxy.envoy.config.route.v3.RouteAction.ClusterSpecifierCase.CLUSTER_SPECIFIER_PLUGIN;
21+
import static io.grpc.xds.XdsEndpointResource.GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS;
2122
import static org.junit.Assert.fail;
2223

2324
import com.github.udpa.udpa.type.v1.TypedStruct;
@@ -108,6 +109,7 @@
108109
import io.envoyproxy.envoy.type.v3.FractionalPercent.DenominatorType;
109110
import io.envoyproxy.envoy.type.v3.Int64Range;
110111
import io.grpc.ClientInterceptor;
112+
import io.grpc.EquivalentAddressGroup;
111113
import io.grpc.InsecureChannelCredentials;
112114
import io.grpc.LoadBalancer;
113115
import io.grpc.LoadBalancerRegistry;
@@ -142,6 +144,7 @@
142144
import io.grpc.xds.internal.Matchers;
143145
import io.grpc.xds.internal.Matchers.FractionMatcher;
144146
import io.grpc.xds.internal.Matchers.HeaderMatcher;
147+
import java.net.InetSocketAddress;
145148
import java.util.Arrays;
146149
import java.util.Collections;
147150
import java.util.List;
@@ -976,6 +979,54 @@ public void parseLocalityLbEndpoints_ignorZeroWeightLocality() {
976979
assertThat(XdsEndpointResource.parseLocalityLbEndpoints(proto)).isNull();
977980
}
978981

982+
@Test
983+
public void parseLocalityLbEndpoints_withDualStackEndpoints() {
984+
String originalDualStackProp =
985+
System.setProperty(GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS, "true");
986+
String v4Address = "172.14.14.5";
987+
String v6Address = "2001:db8::1";
988+
int port = 8888;
989+
990+
try {
991+
io.envoyproxy.envoy.config.endpoint.v3.LocalityLbEndpoints proto =
992+
io.envoyproxy.envoy.config.endpoint.v3.LocalityLbEndpoints.newBuilder()
993+
.setLocality(Locality.newBuilder()
994+
.setRegion("region-foo").setZone("zone-foo").setSubZone("subZone-foo"))
995+
.setLoadBalancingWeight(UInt32Value.newBuilder().setValue(100)) // locality weight
996+
.setPriority(1)
997+
.addLbEndpoints(io.envoyproxy.envoy.config.endpoint.v3.LbEndpoint.newBuilder()
998+
.setEndpoint(Endpoint.newBuilder()
999+
.setAddress(Address.newBuilder()
1000+
.setSocketAddress(
1001+
SocketAddress.newBuilder()
1002+
.setAddress(v4Address).setPortValue(port)))
1003+
.addAdditionalAddresses(Endpoint.AdditionalAddress.newBuilder()
1004+
.setAddress(Address.newBuilder()
1005+
.setSocketAddress(
1006+
SocketAddress.newBuilder()
1007+
.setAddress(v6Address).setPortValue(port)))))
1008+
.setHealthStatus(io.envoyproxy.envoy.config.core.v3.HealthStatus.HEALTHY)
1009+
.setLoadBalancingWeight(UInt32Value.newBuilder().setValue(20)))
1010+
.build();
1011+
1012+
StructOrError<LocalityLbEndpoints> struct =
1013+
XdsEndpointResource.parseLocalityLbEndpoints(proto);
1014+
assertThat(struct.getErrorDetail()).isNull();
1015+
List<java.net.SocketAddress> socketAddressList = Arrays.asList(
1016+
new InetSocketAddress(v4Address, port), new InetSocketAddress(v6Address, port));
1017+
EquivalentAddressGroup expectedEag = new EquivalentAddressGroup(socketAddressList);
1018+
assertThat(struct.getStruct()).isEqualTo(
1019+
LocalityLbEndpoints.create(
1020+
Collections.singletonList(LbEndpoint.create(expectedEag, 20, true)), 100, 1));
1021+
} finally {
1022+
if (originalDualStackProp != null) {
1023+
System.setProperty(GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS, originalDualStackProp);
1024+
} else {
1025+
System.clearProperty(GRPC_EXPERIMENTAL_XDS_DUALSTACK_ENDPOINTS);
1026+
}
1027+
}
1028+
}
1029+
9791030
@Test
9801031
public void parseLocalityLbEndpoints_invalidPriority() {
9811032
io.envoyproxy.envoy.config.endpoint.v3.LocalityLbEndpoints proto =

0 commit comments

Comments
 (0)