Skip to content

perf(endpoints): drop the per-endpoint load-balancing-weight wrapper #8

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

Closed
christianscott wants to merge 1 commit into from
Closed

perf(endpoints): drop the per-endpoint load-balancing-weight wrapper #8

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
13 changes: 11 additions & 2 deletions pkg/kgateway/endpoints/prioritize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,15 @@ func prioritizeWithLbInfo(logger *slog.Logger, ep ir.EndpointsForBackend, lbInfo
return cla
}

// lbWeight returns the per-endpoint load balancing weight, treating an unset
// weight as 1, matching Envoy's default (LbEndpoint.load_balancing_weight).
func lbWeight(ep *envoyendpointv3.LbEndpoint) uint32 {
if w := ep.GetLoadBalancingWeight(); w != nil {
return w.GetValue()
}
return 1
}

// ensure we don't send invalid endpoints to envoy and cause NACKs
func filterInvalidEps(eps []ir.EndpointWithMd) []ir.EndpointWithMd {
return istioslices.Filter(eps, func(ewm ir.EndpointWithMd) bool {
Expand All @@ -178,7 +187,7 @@ func getEndpoints(eps []ir.EndpointWithMd, lbinfo LoadBalancingInfo) []*envoyend
var weight uint32
for _, ep := range eps {
epsOut[0].LbEndpoints = append(epsOut[0].GetLbEndpoints(), ep.LbEndpoint)
weight += ep.LbEndpoint.GetLoadBalancingWeight().GetValue()
weight += lbWeight(ep.LbEndpoint)
}
// reset weight
if weight > 0 {
Expand Down Expand Up @@ -214,7 +223,7 @@ func applyFailoverPriorityPerLocality(
var weight uint32
for _, index := range priorityMap[priority] {
out[i].LbEndpoints = append(out[i].GetLbEndpoints(), eps[index].LbEndpoint)
weight += eps[index].GetLoadBalancingWeight().GetValue()
weight += lbWeight(eps[index].LbEndpoint)
}
// reset weight
if weight > 0 {
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/extensions2/plugins/waypoint/testdata/output/authz-serviceentry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Clusters:
socketAddress:
address: 1.1.1.1
portValue: 5000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-a_se-a.example.com_5000
type: STATIC
Expand All @@ -23,7 +22,6 @@ Clusters:
socketAddress:
address: 2.2.2.2
portValue: 9000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-b_se-b.example.com_9000
type: STATIC
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/extensions2/plugins/waypoint/testdata/output/httproute-se-hostname.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Clusters:
socketAddress:
address: 1.1.1.1
portValue: 5000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-a_se-a.example.com_5000
type: STATIC
Expand All @@ -23,7 +22,6 @@ Clusters:
socketAddress:
address: 2.2.2.2
portValue: 9000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-b_se-b.example.com_9000
type: STATIC
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/extensions2/plugins/waypoint/testdata/output/httproute-se.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Clusters:
socketAddress:
address: 1.1.1.1
portValue: 5000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-a_se-a.example.com_5000
type: STATIC
Expand All @@ -23,7 +22,6 @@ Clusters:
socketAddress:
address: 2.2.2.2
portValue: 9000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-b_se-b.example.com_9000
type: STATIC
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/extensions2/plugins/waypoint/testdata/output/ns-use-waypoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ Clusters:
socketAddress:
address: 3.3.3.3
portValue: 9000
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_infra_se-c_se-c.infra.svc.cluster.local_9000
type: STATIC
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/setup/testdata/experimental/cors-hr-and-tp-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ endpoints:
socketAddress:
address: 10.244.1.12
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
- clusterName: kube_gwtest_reviews_8080
endpoints:
Expand All @@ -48,7 +47,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/setup/testdata/experimental/cors-httproute-backend-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ endpoints:
socketAddress:
address: 10.244.1.12
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
- clusterName: kube_gwtest_reviews_8080
endpoints:
Expand All @@ -48,7 +47,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
2 changes: 0 additions & 2 deletions pkg/kgateway/setup/testdata/experimental/cors-httproute-rule-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ endpoints:
socketAddress:
address: 10.244.1.12
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
- clusterName: kube_gwtest_reviews_8080
endpoints:
Expand All @@ -48,7 +47,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/experimental/cors-trafficpolicy-gw-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/experimental/cors-trafficpolicy-route-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
4 changes: 0 additions & 4 deletions pkg/kgateway/setup/testdata/istio_destination_rule/failover-default-diffns-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -51,7 +50,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -64,7 +62,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -77,7 +74,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
4 changes: 0 additions & 4 deletions pkg/kgateway/setup/testdata/istio_destination_rule/failover-default-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -51,7 +50,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -64,7 +62,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -77,7 +74,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
4 changes: 0 additions & 4 deletions pkg/kgateway/setup/testdata/istio_destination_rule/failover-key-val-labels-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -40,7 +39,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -53,7 +51,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -66,7 +63,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
4 changes: 0 additions & 4 deletions pkg/kgateway/setup/testdata/istio_destination_rule/failover-label-keys-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -40,7 +39,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -53,7 +51,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -66,7 +63,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
4 changes: 0 additions & 4 deletions pkg/kgateway/setup/testdata/istio_destination_rule/failover-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -50,7 +49,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -63,7 +61,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -76,7 +73,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/istio_mtls/istio-svc-mtls-disabled-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
- clusterName: kube_gwtest_httpbin_9000
listeners:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/istio_mtls/istio-svc-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
- clusterName: kube_gwtest_httpbin_9000
listeners:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/listenerbind/v4/happypath-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/listenerbind/v6/happypath-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 8080
loadBalancingWeight: 1
loadBalancingWeight: 1
listeners:
- address:
Expand Down
1 change: 0 additions & 1 deletion pkg/kgateway/setup/testdata/serviceentry/dr/backendconfigpolicy-alias-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ clusters:
socketAddress:
address: 1.1.1.1
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
name: istio-se_gwtest_httpbin-se_se.example.com_80
type: STATIC
Expand Down
5 changes: 0 additions & 5 deletions pkg/kgateway/setup/testdata/serviceentry/dr/se-backendref-out.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ endpoints:
socketAddress:
address: 255.0.0.1
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
priority: 3
- lbEndpoints:
Expand All @@ -41,7 +40,6 @@ endpoints:
socketAddress:
address: 10.244.1.11
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -53,7 +51,6 @@ endpoints:
socketAddress:
address: 10.244.2.14
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -66,7 +63,6 @@ endpoints:
socketAddress:
address: 10.244.3.3
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r1
Expand All @@ -79,7 +75,6 @@ endpoints:
socketAddress:
address: 10.244.4.4
portValue: 80
loadBalancingWeight: 1
loadBalancingWeight: 1
locality:
region: r2
Expand Down
Loading
Loading