xds: NACK route configuration if sum of weights of weighted clusters exceeds uint32_max #6085
Conversation
This file contains 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
…exceeds uint32_max
arvindbr8
added
Type: Bug
Type: Behavior Change
easwars
requested changes
Mar 8, 2023
| @@ -326,17 +326,13 @@ func routesProtoToSlice(routes []*v3routepb.Route, csps map[string]clusterspecif | |||
| } | |||
| wc.HTTPFilterConfigOverride = cfgs | |||
| route.WeightedClusters[c.GetName()] = wc | |||
|
|
|||
| // Sum of all weights cannot exceed MaxUint32. Checking for overflow. | |||
| if totalWeight > (totalWeight + w) { | |||
There was a problem hiding this comment.
What if we declared totalWeight as a uint64 instead? Then we can unconditionally add w to totalWeight and simply check if totalWeight > math.MaxUint32. I feel that will be more readable. What do you think?
|
|
||
| // Sum of all weights cannot exceed MaxUint32. Checking for overflow. | ||
| if totalWeight > (totalWeight + w) { | ||
| return nil, nil, fmt.Errorf("route %+v, action %+v, has no valid cluster in WeightedCluster action", r, a) |
There was a problem hiding this comment.
This error message needs updating.
easwars
approved these changes
Mar 9, 2023
| } | ||
| if totalWeight != wantTotalWeight { | ||
| return nil, nil, fmt.Errorf("route %+v, action %+v, weights of clusters do not add up to total total weight, got: %v, expected total weight from response: %v", r, a, totalWeight, wantTotalWeight) | ||
| totalWeight += uint64(w) |
There was a problem hiding this comment.
Minor nit. If you move this line to 322, then it will look simpler I feel:
totalWeight += uint64(w)
if totalWeight > math.MaxUint32 {
return nil, nil, fmt.Errorf("xds: total weight of clusters exceeds MaxUint32")
}| for _, c := range wcs.Clusters { | ||
| w := c.GetWeight().GetValue() | ||
| if w == 0 { | ||
| continue | ||
| } | ||
| if (totalWeight + uint64(w)) > math.MaxUint32 { | ||
| return nil, nil, fmt.Errorf("total weight of clusters exceed MaxUint32") |
There was a problem hiding this comment.
Nit: s/exceed/exceeds/
Also, add an xds: prefix to the error string.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #6053
RELEASE NOTES: