Skip to content
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

Jump to bottom

fix(xds): eds deadlock on initial fetch timeout (backport of #11602) #11607

Merged
merged 3 commits into from
Oct 1, 2024
Merged

fix(xds): eds deadlock on initial fetch timeout (backport of #11602) #11607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5781db7
fix(xds): eds deadlock on initial fetch timeout (#11602)
jakubdyszkiewicz Oct 1, 2024
4d5d0ca
Merge branch 'release-2.6' into chore/backport-release-2.6-11602
lukidzi Oct 1, 2024
43be4e8
fix conflicts
lukidzi Oct 1, 2024
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
1 change: 0 additions & 1 deletion ...policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ connectTimeout: 5s
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-c58ee0574727fc94
perConnectionBufferLimitBytes: 32768
Expand Down
1 change: 0 additions & 1 deletion ...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ filterChains:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion ...ns/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ connectTimeout: 5s
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-26cb64fa4e85e7b7
perConnectionBufferLimitBytes: 32768
Expand Down
1 change: 0 additions & 1 deletion ...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ filterChains:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down
2 changes: 0 additions & 2 deletions .../meshhealthcheck/plugin/v1alpha1/testdata/basic-meshhttproute.gateway_cluster.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
healthChecks:
- eventLogger:
Expand Down Expand Up @@ -68,7 +67,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-945e63bff332f46a
perConnectionBufferLimitBytes: 32768
Expand Down
1 change: 0 additions & 1 deletion ...ugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
healthChecks:
- eventLogger:
Expand Down
2 changes: 0 additions & 2 deletions pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand All @@ -20,7 +19,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-c72efb5be46fae6b
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...s/policies/meshhttproute/plugin/v1alpha1/testdata/default-meshservice.secrets.golden.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion ...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
7 changes: 0 additions & 7 deletions ...ugin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-348a834721ead661
perConnectionBufferLimitBytes: 32768
Expand All @@ -25,7 +24,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-6d0a1cf7605e8b1e
perConnectionBufferLimitBytes: 32768
Expand All @@ -44,7 +42,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-a285094d9b0d7032
perConnectionBufferLimitBytes: 32768
Expand All @@ -63,7 +60,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-dda53ef9426194b2
perConnectionBufferLimitBytes: 32768
Expand All @@ -82,7 +78,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-ed49e74a1f66b25c
perConnectionBufferLimitBytes: 32768
Expand All @@ -101,7 +96,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-wild-aac0221a73d6116a
perConnectionBufferLimitBytes: 32768
Expand All @@ -120,7 +114,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-wild-dev-52ee11d917faac3e
perConnectionBufferLimitBytes: 32768
Expand Down
5 changes: 0 additions & 5 deletions ...gin/v1alpha1/testdata/gateway-listener-different-hostnames-specific.listeners.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -104,7 +103,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8081:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -164,7 +162,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8082:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -228,7 +225,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTPS:8083:*.secure.dev
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -292,7 +288,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTPS:8083:*.super-secure.dev
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion ...ies/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-26cb64fa4e85e7b7
perConnectionBufferLimitBytes: 32768
Expand Down
2 changes: 0 additions & 2 deletions ...es/meshhttproute/plugin/v1alpha1/testdata/gateway-listener-specific.listeners.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -104,7 +103,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8081:*
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-26cb64fa4e85e7b7
perConnectionBufferLimitBytes: 32768
Expand Down
3 changes: 0 additions & 3 deletions pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/gateway.listeners.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -104,7 +103,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8081:*
requestHeadersTimeout: 0.500s
Expand Down Expand Up @@ -164,7 +162,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8082:*
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion ...plugins/policies/meshhttproute/plugin/v1alpha1/testdata/grpc-service.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion .../meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...cies/meshhttproute/plugin/v1alpha1/testdata/request-header-modifiers.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
2 changes: 0 additions & 2 deletions ...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand All @@ -20,7 +19,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: payments-9f43ffb3c22f8c19
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...ins/policies/meshhttproute/plugin/v1alpha1/testdata/request-redirect.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...ies/meshhttproute/plugin/v1alpha1/testdata/response-header-modifiers.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...ns/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RANDOM
name: backend
Expand Down
1 change: 0 additions & 1 deletion ...ies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RING_HASH
name: backend-d230d75c0fcb71dc
Expand Down
1 change: 0 additions & 1 deletion ...es/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway.listeners.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion ...s/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: mesh-1:eds-cluster
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...cies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress_basic.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: mesh-1:eds-cluster
type: EDS
Expand Down
1 change: 0 additions & 1 deletion ...oadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
name: backend-d230d75c0fcb71dc
perConnectionBufferLimitBytes: 32768
Expand Down
1 change: 0 additions & 1 deletion ...adbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway.listeners.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ resources:
rds:
configSource:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
routeConfigName: sample-gateway:HTTP:8080:*
requestHeadersTimeout: 0.500s
Expand Down
1 change: 0 additions & 1 deletion ...hloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_basic.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RANDOM
name: backend
Expand Down
1 change: 0 additions & 1 deletion ...trategy/plugin/v1alpha1/testdata/locality_aware_basic_egress_enabled.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RANDOM
name: backend
Expand Down
1 change: 0 additions & 1 deletion ...balancingstrategy/plugin/v1alpha1/testdata/locality_aware_cross_zone.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RANDOM
name: backend
Expand Down
1 change: 0 additions & 1 deletion ...ancingstrategy/plugin/v1alpha1/testdata/locality_aware_no_cross_zone.clusters.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ resources:
edsClusterConfig:
edsConfig:
ads: {}
initialFetchTimeout: 0s
resourceApiVersion: V3
lbPolicy: RANDOM
name: backend
Expand Down
Loading
Loading