MINOR: config: remove experimental status on tune.disable-fast-forward

The option was turned to off by default in 2.8 with commit 2f7c82bfd
("BUG/MINOR: haproxy: Fix option to disable the fast-forward"), however
at the same time it should have dropped its experimental status since
the feature is enabled by default. The only goal of the option is to
debug something, like many other tune.xxx options. The option should
still normally not be used without being invited to do so by developers
looking for something specific though.

This could be backported if desired to simplify debugging, though this
has never been needed for now.

diff --git a/doc/configuration.txt b/doc/configuration.txt
index 8aec5faae65fb608ebc917d5e1be0204248d48f1..2d169fd27cf2e210e189c683e48cc625871db60d 100644 (file)
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3996,16 +3996,14 @@ tune.comp.maxlevel <number>
   Each stream using compression initializes the compression algorithm with
   this value. The default value is 1.
 
-tune.disable-fast-forward [ EXPERIMENTAL ]
+tune.disable-fast-forward
   Disables the data fast-forwarding. It is a mechanism to optimize the data
   forwarding by passing data directly from a side to the other one without
   waking the stream up. Thanks to this directive, it is possible to disable
   this optimization. Note it also disable any kernel tcp splicing but also the
   zero-copy forwarding. This command is not meant for regular use, it will
   generally only be suggested by developers along complex debugging
-  sessions. For this reason it is internally marked as experimental, meaning
-  that "expose-experimental-directives" must appear on a line before this
-  directive.
+  sessions.
 
 tune.disable-zero-copy-forwarding
   Globally disables the zero-copy forwarding of data. It is a mechanism to

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index b5a756d7a2e6066deb8fba9e7071ac6629f77e84..79005384cc741ff3645e41ae435129787edd5204 100644 (file)
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -1473,12 +1473,6 @@ static int cfg_parse_global_tune_forward_opts(char **args, int section_type,
                return -1;
 
        if (strcmp(args[0], "tune.disable-fast-forward") == 0) {
-               if (!experimental_directives_allowed) {
-                       memprintf(err, "'%s' directive is experimental, must be allowed via a global 'expose-experimental-directives'",
-                                args[0]);
-                       return -1;
-               }
-               mark_tainted(TAINTED_CONFIG_EXP_KW_DECLARED);
                global.tune.options &= ~GTUNE_USE_FAST_FWD;
        }
        else if (strcmp(args[0], "tune.disable-zero-copy-forwarding") == 0) {