MINOR: global: add tune.h2.zero-copy-fwd-send

Signed-off-by: Vincent Gramer <[email protected]>
haproxytech · Dec 5, 2023 · ca44a7a · ca44a7a
1 parent f120158
commit ca44a7a
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 2 deletions.
diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go
@@ -62,6 +62,7 @@ global
   tune.h2.initial-window-size 16
   tune.h2.max-concurrent-streams 17
   tune.h2.max-frame-size 18
+  tune.h2.zero-copy-fwd-send on
   tune.http.cookielen 19
   tune.http.logurilen 20
   tune.http.maxhdr 21

diff --git a/configuration/global.go b/configuration/global.go
@@ -2569,6 +2569,9 @@ func serializeTuneOptions(p parser.Parser, options *models.GlobalTuneOptions) er
 	if err := serializeInt64Option(p, "tune.h2.fe.max-concurrent-streams", options.H2FeMaxConcurrentStreams); err != nil {
 		return err
 	}
+	if err := serializeOnOffOption(p, "tune.h2.zero-copy-fwd-send", options.H2ZeroCopyFwdSend); err != nil {
+		return err
+	}
 	return serializeInt64Option(p, "tune.zlib.windowsize", options.ZlibWindowsize)
 }
 
@@ -3207,6 +3210,12 @@ func parseTuneOptions(p parser.Parser) (*models.GlobalTuneOptions, error) { //no
 	}
 	options.H2FeMaxConcurrentStreams = intOption
 
+	strOption, err = parseOnOffOption(p, "tune.h2.zero-copy-fwd-send")
+	if err != nil {
+		return nil, err
+	}
+	options.H2ZeroCopyFwdSend = strOption
+
 	return options, nil
 }
 

diff --git a/configuration/global_test.go b/configuration/global_test.go
@@ -312,6 +312,9 @@ func TestGetGlobal(t *testing.T) {
 	if global.TuneOptions.H2MaxFrameSize != 18 {
 		t.Errorf("H2MaxFrameSize is %v, expected 18", global.TuneOptions.H2MaxFrameSize)
 	}
+	if global.TuneOptions.H2ZeroCopyFwdSend != "enabled" {
+		t.Errorf("H2ZeroCopyFwdSend is %v, expected enabled", global.TuneOptions.H2ZeroCopyFwdSend)
+	}
 	if global.TuneOptions.HTTPCookielen != 19 {
 		t.Errorf("HTTPCookielen is %v, expected 19", global.TuneOptions.HTTPCookielen)
 	}
@@ -739,6 +742,7 @@ func TestPutGlobal(t *testing.T) {
 			EventsMaxEventsAtOnce:          50,
 			H1ZeroCopyFwdRecv:              "disabled",
 			H1ZeroCopyFwdSend:              "disabled",
+			H2ZeroCopyFwdSend:              "disabled",
 			LuaLogLoggers:                  "disabled",
 			LuaLogStderr:                   "disabled",
 			MaxChecksPerThread:             misc.Int64P(20),

diff --git a/models/global.go b/models/global.go
diff --git a/models/global_compare.go b/models/global_compare.go
diff --git a/models/global_compare_test.go b/models/global_compare_test.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -1641,6 +1641,12 @@ definitions:
                   h2_max_frame_size:
                       type: integer
                       x-display-name: HTTP/2 Maximum Frame Size
+                  h2_zero_copy_fwd_send:
+                      enum:
+                          - enabled
+                          - disabled
+                      type: string
+                      x-display-name: enable or disable the zero-copy sends of data for the HTTP/2 multiplexer
                   http_cookielen:
                       type: integer
                       x-display-name: Maximum Cookie Length

diff --git a/specification/models/configuration/global.yaml b/specification/models/configuration/global.yaml
@@ -341,6 +341,10 @@ global:
         h2_fe_max_concurrent_streams:
           type: integer
           x-display-name: Maximum number of concurrent streams per incoming connection
+        h2_zero_copy_fwd_send:
+          type: string
+          enum: [enabled, disabled]
+          x-display-name: enable or disable the zero-copy sends of data for the HTTP/2 multiplexer
         http_cookielen:
           type: integer
           x-display-name: Maximum Cookie Length