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

xds: fix bug of missing cluster_service_name conversion in v2 ClusterStats (#7849)

This commit is contained in:
Chengyuan Zhang 2021-01-27 18:18:22 -08:00 committed by GitHub
parent 14a38ef9b5
commit 09869528f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xds/src/main/java/io/grpc/xds/EnvoyProtoData.java
View File

@ -1358,6 +1358,9 @@ final class EnvoyProtoData {
io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.Builder builder = io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.Builder builder =
io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder() io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder()
.setClusterName(clusterName); .setClusterName(clusterName);
if (clusterServiceName != null) {
builder.setClusterServiceName(clusterServiceName);
}
for (UpstreamLocalityStats upstreamLocalityStats : upstreamLocalityStatsList) { for (UpstreamLocalityStats upstreamLocalityStats : upstreamLocalityStatsList) {
builder.addUpstreamLocalityStats( builder.addUpstreamLocalityStats(
upstreamLocalityStats.toEnvoyProtoUpstreamLocalityStatsV2()); upstreamLocalityStats.toEnvoyProtoUpstreamLocalityStatsV2());

3
xds/src/test/java/io/grpc/xds/EnvoyProtoDataTest.java
View File

@ -557,6 +557,7 @@ public class EnvoyProtoDataTest {
ClusterStats clusterStats = ClusterStats clusterStats =
ClusterStats.newBuilder() ClusterStats.newBuilder()
.setClusterName("cluster1") .setClusterName("cluster1")
.setClusterServiceName("backend-service1")
.setLoadReportIntervalNanos(1234) .setLoadReportIntervalNanos(1234)
.setTotalDroppedRequests(123) .setTotalDroppedRequests(123)
.addUpstreamLocalityStats(UpstreamLocalityStats.newBuilder() .addUpstreamLocalityStats(UpstreamLocalityStats.newBuilder()
@ -579,6 +580,7 @@ public class EnvoyProtoDataTest {
assertThat(clusterStatsProto).isEqualTo( assertThat(clusterStatsProto).isEqualTo(
io.envoyproxy.envoy.config.endpoint.v3.ClusterStats.newBuilder() io.envoyproxy.envoy.config.endpoint.v3.ClusterStats.newBuilder()
.setClusterName("cluster1") .setClusterName("cluster1")
.setClusterServiceName("backend-service1")
.setLoadReportInterval(Durations.fromNanos(1234)) .setLoadReportInterval(Durations.fromNanos(1234))
.setTotalDroppedRequests(123) .setTotalDroppedRequests(123)
.addUpstreamLocalityStats( .addUpstreamLocalityStats(
@ -605,6 +607,7 @@ public class EnvoyProtoDataTest {
assertThat(clusterStatsProtoV2).isEqualTo( assertThat(clusterStatsProtoV2).isEqualTo(
io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder() io.envoyproxy.envoy.api.v2.endpoint.ClusterStats.newBuilder()
.setClusterName("cluster1") .setClusterName("cluster1")
.setClusterServiceName("backend-service1")
.setLoadReportInterval(Durations.fromNanos(1234)) .setLoadReportInterval(Durations.fromNanos(1234))
.setTotalDroppedRequests(123) .setTotalDroppedRequests(123)
.addUpstreamLocalityStats( .addUpstreamLocalityStats(