Skip to content

xds: reject EDS drop policy with unsupported denominator #9218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nvxbug wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xds: reject EDS drop policy with unsupported denominator #9218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions internal/xds/xdsclient/xdsresource/unmarshal_eds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func parseAddress(socketAddress *v3corepb.SocketAddress) string {
return net.JoinHostPort(socketAddress.GetAddress(), strconv.Itoa(int(socketAddress.GetPortValue())))
}

func parseDropPolicy(dropPolicy *v3endpointpb.ClusterLoadAssignment_Policy_DropOverload) OverloadDropConfig {
func parseDropPolicy(dropPolicy *v3endpointpb.ClusterLoadAssignment_Policy_DropOverload) (OverloadDropConfig, error) {
percentage := dropPolicy.GetDropPercentage()
var (
numerator = percentage.GetNumerator()
Expand All @@ -90,12 +90,14 @@ func parseDropPolicy(dropPolicy *v3endpointpb.ClusterLoadAssignment_Policy_DropO
denominator = 10000
case v3typepb.FractionalPercent_MILLION:
denominator = 1000000
default:
return OverloadDropConfig{}, fmt.Errorf("EDS response contains a drop policy with unsupported denominator: %v", percentage.GetDenominator())
}
return OverloadDropConfig{
Category: dropPolicy.GetCategory(),
Numerator: numerator,
Denominator: denominator,
}
}, nil
}

func parseEndpoints(lbEndpoints []*v3endpointpb.LbEndpoint, uniqueEndpointAddrs map[string]bool) ([]Endpoint, error) {
Expand Down Expand Up @@ -179,7 +181,11 @@ func hashKeyFromMetadata(metadata map[string]any) string {
func parseEDSRespProto(m *v3endpointpb.ClusterLoadAssignment) (EndpointsUpdate, error) {
ret := EndpointsUpdate{}
for _, dropPolicy := range m.GetPolicy().GetDropOverloads() {
ret.Drops = append(ret.Drops, parseDropPolicy(dropPolicy))
drop, err := parseDropPolicy(dropPolicy)
if err != nil {
return EndpointsUpdate{}, err
}
ret.Drops = append(ret.Drops, drop)
}
priorities := make(map[uint32]map[string]bool)
sumOfWeights := make(map[uint32]uint64)
Expand Down
17 changes: 17 additions & 0 deletions internal/xds/xdsclient/xdsresource/unmarshal_eds_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,23 @@ func (s) TestEDSParseRespProto(t *testing.T) {
want: EndpointsUpdate{},
wantErr: true,
},
{
name: "unsupported-drop-denominator",
m: &v3endpointpb.ClusterLoadAssignment{
ClusterName: "test",
Policy: &v3endpointpb.ClusterLoadAssignment_Policy{
DropOverloads: []*v3endpointpb.ClusterLoadAssignment_Policy_DropOverload{{
Category: "test-drop",
DropPercentage: &v3typepb.FractionalPercent{
Numerator: 1,
Denominator: v3typepb.FractionalPercent_DenominatorType(7),
},
}},
},
},
want: EndpointsUpdate{},
wantErr: true,
},
{
name: "good",
m: func() *v3endpointpb.ClusterLoadAssignment {
Expand Down
Loading