feat: set tcp proxy listener buffer (#1306)

Signed-off-by: bitliu <bitliu@tencent.com>
envoyproxy · Apr 18, 2023 · ef98e16 · ef98e16
1 parent f8da5b4
commit ef98e16
Show file tree

Hide file tree

Showing 36 changed files with 55 additions and 4 deletions.
diff --git a/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml b/internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml
@@ -305,6 +305,7 @@ xds:
                   - upgradeType: websocket
                   useRemoteAddress: true
             name: default-eg-http
+            perConnectionBufferLimitBytes: 32768
     - '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
       dynamicRouteConfigs:
       - routeConfig:

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json
@@ -367,7 +367,8 @@
 									}
 								}]
 							},
-							"name": "default-eg-http"
+							"name": "default-eg-http",
+							"perConnectionBufferLimitBytes": 32768
 						}
 					}
 				}, {
@@ -428,7 +429,8 @@
 									}
 								}]
 							},
-							"name": "default-eg-grpc"
+							"name": "default-eg-grpc",
+							"perConnectionBufferLimitBytes": 32768
 						}
 					}
 				}, {
@@ -479,7 +481,8 @@
 									"@type": "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
 								}
 							}],
-							"name": "default-eg-tls-passthrough-backend"
+							"name": "default-eg-tls-passthrough-backend",
+							"perConnectionBufferLimitBytes": 32768
 						}
 					}
 				}, {
@@ -521,7 +524,8 @@
 									}
 								}]
 							}],
-							"name": "default-eg-tcp-backend"
+							"name": "default-eg-tcp-backend",
+							"perConnectionBufferLimitBytes": 32768
 						}
 					}
 				}, {

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml
@@ -249,6 +249,7 @@ xds:
                   - upgradeType: websocket
                   useRemoteAddress: true
             name: default-eg-http
+            perConnectionBufferLimitBytes: 32768
       - activeState:
           listener:
             '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -291,6 +292,7 @@ xds:
                   statPrefix: http
                   useRemoteAddress: true
             name: default-eg-grpc
+            perConnectionBufferLimitBytes: 32768
       - activeState:
           listener:
             '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -327,6 +329,7 @@ xds:
               typedConfig:
                 '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
             name: default-eg-tls-passthrough-backend
+            perConnectionBufferLimitBytes: 32768
       - activeState:
           listener:
             '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -356,6 +359,7 @@ xds:
                   cluster: default-eg-tcp-backend
                   statPrefix: tcp
             name: default-eg-tcp-backend
+            perConnectionBufferLimitBytes: 32768
       - activeState:
           listener:
             '@type': type.googleapis.com/envoy.config.listener.v3.Listener

diff --git a/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml b/internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml
@@ -42,6 +42,7 @@ xds:
                 - upgradeType: websocket
                 useRemoteAddress: true
           name: default-eg-http
+          perConnectionBufferLimitBytes: 32768
     - activeState:
         listener:
           '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -84,6 +85,7 @@ xds:
                 statPrefix: http
                 useRemoteAddress: true
           name: default-eg-grpc
+          perConnectionBufferLimitBytes: 32768
     - activeState:
         listener:
           '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -120,6 +122,7 @@ xds:
             typedConfig:
               '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
           name: default-eg-tls-passthrough-backend
+          perConnectionBufferLimitBytes: 32768
     - activeState:
         listener:
           '@type': type.googleapis.com/envoy.config.listener.v3.Listener
@@ -149,6 +152,7 @@ xds:
                 cluster: default-eg-tcp-backend
                 statPrefix: tcp
           name: default-eg-tcp-backend
+          perConnectionBufferLimitBytes: 32768
     - activeState:
         listener:
           '@type': type.googleapis.com/envoy.config.listener.v3.Listener

diff --git a/internal/xds/translator/listener.go b/internal/xds/translator/listener.go
@@ -24,10 +24,16 @@ import (
 	"github.com/envoyproxy/go-control-plane/pkg/wellknown"
 	"github.com/golang/protobuf/ptypes/wrappers"
 	"google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/envoyproxy/gateway/internal/ir"
 )
 
+const (
+	// https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/listener/v3/listener.proto#envoy-v3-api-field-config-listener-v3-listener-per-connection-buffer-limit-bytes
+	tcpListenerPerConnectionBufferLimitBytes = 32768
+)
+
 func buildXdsTCPListener(name, address string, port uint32) *listenerv3.Listener {
 	accesslogAny, _ := anypb.New(stdoutFileAccessLog)
 	return &listenerv3.Listener{
@@ -39,6 +45,7 @@ func buildXdsTCPListener(name, address string, port uint32) *listenerv3.Listener
 				Filter:     listenerAccessLogFilter,
 			},
 		},
+		PerConnectionBufferLimitBytes: wrapperspb.UInt32(tcpListenerPerConnectionBufferLimitBytes),
 		Address: &corev3.Address{
 			Address: &corev3.Address_SocketAddress{
 				SocketAddress: &corev3.SocketAddress{

diff --git a/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml b/...l/xds/translator/testdata/out/extension-xds-ir/http-route-extension-filter.listeners.yaml
@@ -35,4 +35,5 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: extension-listener
+  perConnectionBufferLimitBytes: 32768
   statPrefix: mock-extension-inserted-prefix
diff --git a/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/extension-xds-ir/http-route.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-multi-provider.listeners.yaml
@@ -96,3 +96,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-multi-route-single-provider.listeners.yaml
@@ -66,3 +66,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-ratelimit.listeners.yaml
@@ -62,3 +62,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/authn-single-route-single-match.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/authn-single-route-single-match.listeners.yaml
@@ -53,3 +53,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-direct-response.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-mirror.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-redirect.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-regex.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-request-headers.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-response-add-headers.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/.../xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml b/.../xds/translator/testdata/out/xds-ir/http-route-response-add-remove-headers.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/...rnal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml b/...rnal/xds/translator/testdata/out/xds-ir/http-route-response-remove-headers.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/...xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml b/...xds/translator/testdata/out/xds-ir/http-route-rewrite-root-path-url-prefix.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-fullpath.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-host.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-rewrite-url-prefix.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route-weighted-backend.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/...nal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml b/...nal/xds/translator/testdata/out/xds-ir/http-route-weighted-invalid-backend.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http-route.listeners.yaml
@@ -35,3 +35,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/http2-route.listeners.yaml
@@ -37,3 +37,4 @@
         statPrefix: http
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/multiple-listeners-same-port.listeners.yaml
@@ -138,3 +138,4 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/...nal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml b/...nal/xds/translator/testdata/out/xds-ir/multiple-simple-tcp-route-same-port.listeners.yaml
@@ -68,3 +68,4 @@
         cluster: tcp-route-simple-4
         statPrefix: tcp
   name: tcp-route-simple
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit-sourceip.listeners.yaml
@@ -44,3 +44,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/ratelimit.listeners.yaml
@@ -44,3 +44,4 @@
         - upgradeType: websocket
         useRemoteAddress: true
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/simple-tls.listeners.yaml
@@ -49,3 +49,4 @@
               ads: {}
               resourceApiVersion: V3
   name: first-listener
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-complex.listeners.yaml
@@ -33,3 +33,4 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   name: tcp-route-complex
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-simple.listeners.yaml
@@ -24,3 +24,4 @@
         cluster: tcp-route-simple
         statPrefix: tcp
   name: tcp-route-simple
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tcp-route-weighted-backend.listeners.yaml
@@ -33,3 +33,4 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   name: tcp-route-weighted-backend
+  perConnectionBufferLimitBytes: 32768
diff --git a/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml b/internal/xds/translator/testdata/out/xds-ir/tls-route-passthrough.listeners.yaml
@@ -31,3 +31,4 @@
     typedConfig:
       '@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
   name: tls-passthrough
+  perConnectionBufferLimitBytes: 32768