xds: ORCA to LRS propagation changes #12203
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shivaspeaks
changed the title
ejona86
reviewed
Jul 9, 2025
| @@ -25,6 +25,7 @@ | |||
| import com.google.common.collect.Sets; | |||
| import io.grpc.Internal; | |||
| import io.grpc.Status; | |||
| import io.grpc.xds.BackendMetricPropagation; | |||
There was a problem hiding this comment.
io.grpc.xds.client can't depend on io.grpc.xds. We moved client into its own package so it could be used without the rest of grpc.
| @@ -420,6 +421,29 @@ public void run() { | |||
| return loadCounter; | |||
| } | |||
|
|
|||
| @Override | |||
| public LoadStatsManager2.ClusterLocalityStats addClusterLocalityStats( | |||
There was a problem hiding this comment.
Shouldn't the old method just call this one with backendMetricPropagation set to null? (Feel free to do that in XdsClient.java)
AgraVator
reviewed
Jul 16, 2025
| namedMetricKeysBuilder.add(metricKey); | ||
| } | ||
| } | ||
| break; |
There was a problem hiding this comment.
Why is this required ?
AgraVator
reviewed
Jul 16, 2025
Comment on lines
+806
to
809
| Map<String, Struct> filterMetadata, @Nullable BackendMetricPropagation backendMetricPropagation, | ||
| @Nullable OutlierDetection outlierDetection, Object endpointLbConfig, | ||
| LoadBalancerRegistry lbRegistry, Map<String, | ||
| Map<Locality, Integer>> prioritizedLocalityWeights, List<DropOverload> dropOverloads) { |
There was a problem hiding this comment.
nit: Can we add backendMetricPropagation param to the end of the methods for better consistency ?
AgraVator
reviewed
Jul 16, 2025
| @@ -326,7 +336,7 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster( | |||
|
|
|||
| return StructOrError.fromStruct(CdsUpdate.forEds( | |||
| clusterName, edsServiceName, lrsServerInfo, maxConcurrentRequests, upstreamTlsContext, | |||
| outlierDetection, isHttp11ProxyAvailable)); | |||
| outlierDetection, isHttp11ProxyAvailable, backendMetricPropagation)); | |||
AgraVator
reviewed
Jul 16, 2025
Comment on lines
373
to
+375
| return StructOrError.fromStruct(CdsUpdate.forLogicalDns( | ||
| clusterName, dnsHostName, lrsServerInfo, maxConcurrentRequests, | ||
| upstreamTlsContext, isHttp11ProxyAvailable)); | ||
| upstreamTlsContext, isHttp11ProxyAvailable, backendMetricPropagation)); |
AgraVator
reviewed
Jul 16, 2025
Comment on lines
+429
to
+443
| if (memUtilization > 0) { | ||
| boolean shouldPropagate = true; | ||
| if (backendMetricPropagation != null) { | ||
| shouldPropagate = backendMetricPropagation.propagateMemUtilization; | ||
| } | ||
|
|
||
| if (shouldPropagate) { | ||
| String metricName = "mem_utilization"; | ||
| if (!loadMetricStatsMap.containsKey(metricName)) { | ||
| loadMetricStatsMap.put(metricName, new BackendLoadMetricStats(1, memUtilization)); | ||
| } else { | ||
| loadMetricStatsMap.get(metricName).addMetricValueAndIncrementRequestsFinished(memUtilization); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Can this be extracted out to a separate function ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements gRFC A85 (grpc/proposal#454).
TODO: Unit tests