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

…11608) Signed-off-by: Jakub Dyszkiewicz <jakub.dyszkiewicz@gmail.com> Co-authored-by: Lukasz Dziedziak <lukidzi@gmail.com>
kumahq · Oct 1, 2024 · 9ddaad1 · 9ddaad1
1 parent cf62043
commit 9ddaad1
Show file tree

Hide file tree

Showing 148 changed files with 0 additions and 337 deletions.
diff --git a/...policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml b/...policies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.cluster.golden.yaml
@@ -2,7 +2,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-c58ee0574727fc94
 perConnectionBufferLimitBytes: 32768

diff --git a/...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml b/...olicies/meshaccesslog/plugin/v1alpha1/testdata/basic-gateway.gateway.listener.golden.yaml
@@ -49,7 +49,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/...ns/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml b/...ns/policies/meshcircuitbreaker/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
@@ -9,7 +9,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-26cb64fa4e85e7b7
 perConnectionBufferLimitBytes: 32768

diff --git a/...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/...s/policies/meshfaultinjection/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml
@@ -57,7 +57,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/...ugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml b/...ugins/policies/meshhealthcheck/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
@@ -7,7 +7,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 healthChecks:
 - eventLogger:

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS
@@ -20,7 +19,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-c72efb5be46fae6b
     type: EDS

diff --git a/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml b/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/default-route.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ins/policies/meshhttproute/plugin/v1alpha1/testdata/header-modifiers.clusters.golden.yaml b/...ins/policies/meshhttproute/plugin/v1alpha1/testdata/header-modifiers.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml b/...lugins/policies/meshhttproute/plugin/v1alpha1/testdata/headers-match.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/.../meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml b/.../meshhttproute/plugin/v1alpha1/testdata/mixed-tcp-and-http-outbounds.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml b/...ugins/policies/meshhttproute/plugin/v1alpha1/testdata/request-mirror.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS
@@ -20,7 +19,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: payments-9f43ffb3c22f8c19
     type: EDS

diff --git a/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml b/pkg/plugins/policies/meshhttproute/plugin/v1alpha1/testdata/url-rewrite.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend
     type: EDS

diff --git a/...ns/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml b/...ns/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...cies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml b/...cies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway_cluster.golden.yaml
@@ -2,7 +2,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 lbPolicy: RING_HASH
 name: backend-d230d75c0fcb71dc

diff --git a/...ies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway_listener.golden.yaml b/...ies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/basic.gateway_listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/...s/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml b/...s/policies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress.clusters.golden.yaml
@@ -6,7 +6,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: mesh-1:eds-cluster
     type: EDS

diff --git a/...cies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress_basic.clusters.golden.yaml b/...cies/meshloadbalancingstrategy/plugin/v1alpha1/testdata/egress_basic.clusters.golden.yaml
@@ -6,7 +6,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: mesh-1:eds-cluster
     type: EDS

diff --git a/...loadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway_cluster.golden.yaml b/...loadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway_cluster.golden.yaml
@@ -4,7 +4,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-d230d75c0fcb71dc
 perConnectionBufferLimitBytes: 32768

diff --git a/...oadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway_listener.golden.yaml b/...oadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware.gateway_listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/...hloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_basic.clusters.golden.yaml b/...hloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_basic.clusters.golden.yaml
@@ -7,7 +7,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...trategy/plugin/v1alpha1/testdata/locality_aware_basic_egress_enabled.clusters.golden.yaml b/...trategy/plugin/v1alpha1/testdata/locality_aware_basic_egress_enabled.clusters.golden.yaml
@@ -7,7 +7,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...balancingstrategy/plugin/v1alpha1/testdata/locality_aware_cross_zone.clusters.golden.yaml b/...balancingstrategy/plugin/v1alpha1/testdata/locality_aware_cross_zone.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...ancingstrategy/plugin/v1alpha1/testdata/locality_aware_no_cross_zone.clusters.golden.yaml b/...ancingstrategy/plugin/v1alpha1/testdata/locality_aware_no_cross_zone.clusters.golden.yaml
@@ -7,7 +7,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend

diff --git a/...hloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_split.clusters.golden.yaml b/...hloadbalancingstrategy/plugin/v1alpha1/testdata/locality_aware_split.clusters.golden.yaml
@@ -7,7 +7,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend-bb38a94289f18fb9
@@ -20,7 +19,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     lbPolicy: RANDOM
     name: backend-c72efb5be46fae6b

diff --git a/...lugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml b/...lugins/policies/meshratelimit/plugin/v1alpha1/testdata/gateway_basic_listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml b/pkg/plugins/policies/meshretry/plugin/v1alpha1/testdata/gateway.http.listeners.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/...cproute/plugin/v1alpha1/testdata/meshhttproute-clash-tcp-destination.clusters.golden.yaml b/...cproute/plugin/v1alpha1/testdata/meshhttproute-clash-tcp-destination.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: tcp-backend
     type: EDS

diff --git a/...gins/policies/meshtcproute/plugin/v1alpha1/testdata/redirect-traffic.clusters.golden.yaml b/...gins/policies/meshtcproute/plugin/v1alpha1/testdata/redirect-traffic.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: tcp-backend
     type: EDS

diff --git a/...plugins/policies/meshtcproute/plugin/v1alpha1/testdata/split-traffic.clusters.golden.yaml b/...plugins/policies/meshtcproute/plugin/v1alpha1/testdata/split-traffic.clusters.golden.yaml
@@ -5,7 +5,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-bb38a94289f18fb9
     type: EDS
@@ -20,7 +19,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: backend-c72efb5be46fae6b
     type: EDS
@@ -61,7 +59,6 @@ resources:
     edsClusterConfig:
       edsConfig:
         ads: {}
-        initialFetchTimeout: 0s
         resourceApiVersion: V3
     name: other-backend
     type: EDS

diff --git a/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.cluster.golden.yaml b/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.cluster.golden.yaml
@@ -2,7 +2,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-26cb64fa4e85e7b7
 perConnectionBufferLimitBytes: 32768

diff --git a/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml b/pkg/plugins/policies/meshtimeout/plugin/testdata/basic.gateway.listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/.../policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.cluster.golden.yaml b/.../policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.cluster.golden.yaml
@@ -2,7 +2,6 @@ connectTimeout: 10s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-26cb64fa4e85e7b7
 perConnectionBufferLimitBytes: 32768

diff --git a/...policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml b/...policies/meshtimeout/plugin/testdata/no-default-idle-timeout.gateway.listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/.../policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.cluster.golden.yaml b/.../policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.cluster.golden.yaml
@@ -2,7 +2,6 @@ connectTimeout: 5s
 edsClusterConfig:
   edsConfig:
     ads: {}
-    initialFetchTimeout: 0s
     resourceApiVersion: V3
 name: backend-26cb64fa4e85e7b7
 perConnectionBufferLimitBytes: 32768

diff --git a/...policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml b/...policies/meshtimeout/plugin/testdata/no-route-level-timeouts.gateway.listener.golden.yaml
@@ -40,7 +40,6 @@ filterChains:
       rds:
         configSource:
           ads: {}
-          initialFetchTimeout: 0s
           resourceApiVersion: V3
         routeConfigName: sample-gateway:HTTP:8080
       requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/01-gateway-listener.yaml
@@ -47,7 +47,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: edge-gateway:HTTP:8080
             requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/02-gateway-listener.yaml
@@ -47,7 +47,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: edge-gateway:HTTP:8080
             requestHeadersTimeout: 0.500s
@@ -105,7 +104,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: edge-gateway:HTTP:9090
             requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/03-gateway-listener.yaml
@@ -62,7 +62,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: tracing-gateway:HTTP:8080
             requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/04-gateway-listener.yaml
@@ -56,7 +56,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: logging-gateway:HTTP:8080
             requestHeadersTimeout: 0.500s

diff --git a/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml b/pkg/plugins/runtime/gateway/testdata/05-gateway-listener.yaml
@@ -51,7 +51,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: default-gateway:HTTPS:443
             requestHeadersTimeout: 0.500s
@@ -115,7 +114,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: default-gateway:HTTPS:443
             requestHeadersTimeout: 0.500s
@@ -179,7 +177,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: default-gateway:HTTPS:443
             requestHeadersTimeout: 0.500s
@@ -241,7 +238,6 @@ Listeners:
             rds:
               configSource:
                 ads: {}
-                initialFetchTimeout: 0s
                 resourceApiVersion: V3
               routeConfigName: default-gateway:HTTPS:443
             requestHeadersTimeout: 0.500s