Merge pull request #4521 from esl/remove-max-fsm-queue

Remove the dead 'max_fsm_queue' option

After the c2s, s2s and components rework, this option becomes dead. You could set it but it had no effect.

There are no plans to bring it back, and shapers are recommended instead.

To do for the future: add notes to the migration guide. This is left out from this PR, because we have to update the migration guide after merging faeture/listeners anyway.

Author: NelsonVides

doc/configuration/general.md

@@ -182,11 +182,3 @@ The options listed below are used to configure more specific settings, that do n
 * **Example:** `http_server_name = "Apache"`
 
 Replaces [Cowboy](https://github.com/ninenines/cowboy)'s default name returned in the `server` HTTP response header. It may be used for extra security, as it makes it harder for the malicious user to learn what HTTP software is running under a specific port. This option applies to **all** configured HTTP listeners.
-
-### `general.max_fsm_queue`
-* **Syntax:** positive integer
-* **Default:** not set
-* **Example:** `max_fsm_queue = 5000`
-
-When specified, will terminate certain processes (e.g. client handlers) that have more messages accumulated in the queue than the specified limit, to prevent resource exhaustion.
-This option is set for outgoing S2S connections and can be overridden for particular `s2s` listeners in their configurations. **Use with caution!**

rel/files/mongooseim.toml

@@ -14,7 +14,6 @@
   {{#s2s_backend}}
   s2s_backend = {{{s2s_backend}}}
   {{/s2s_backend}}
-  max_fsm_queue = 1000
   {{#http_server_name}}
   http_server_name = {{{http_server_name}}}
   {{/http_server_name}}

src/config/mongoose_config_spec.erl

@@ -180,9 +180,6 @@ general() ->
                  <<"s2s_backend">> => #option{type = atom,
                                               validate = {module, mongoose_s2s},
                                               wrap = global_config},
-                 <<"max_fsm_queue">> => #option{type = integer,
-                                                validate = positive,
-                                                wrap = global_config},
                  <<"http_server_name">> => #option{type = string,
                                                    wrap = global_config},
                  <<"rdbms_server_type">> => #option{type = atom,

test/common/config_parser_helper.erl

@@ -249,7 +249,6 @@ options("mongooseim-pgsql") ->
                })
       ]},
      {loglevel, warning},
-     {max_fsm_queue, 1000},
      {outgoing_pools,
       lists:map(
         fun pool_config/1,

test/config_parser_SUITE.erl

@@ -77,7 +77,6 @@ groups() ->
                             sm_backend,
                             component_backend,
                             s2s_backend,
-                            max_fsm_queue,
                             http_server_name,
                             rdbms_server_type,
                             route_subdomains,
@@ -415,10 +414,6 @@ s2s_backend(_Config) ->
     ?err(#{<<"general">> => #{<<"s2s_backend">> => <<"redis">>}}),
     ?err(#{<<"general">> => #{<<"s2s_backend">> => <<"amnesia">>}}).
 
-max_fsm_queue(_Config) ->
-    ?cfg(max_fsm_queue, 100, #{<<"general">> => #{<<"max_fsm_queue">> => 100}}),
-    ?err(#{<<"general">> => #{<<"max_fsm_queue">> => -10}}).
-
 http_server_name(_Config) ->
     ?cfg(http_server_name, "my server",
          #{<<"general">> => #{<<"http_server_name">> => <<"my server">>}}),

test/config_parser_SUITE_data/mongooseim-pgsql.toml

@@ -9,7 +9,6 @@
   registration_timeout = "infinity"
   language = "en"
   sm_backend = "mnesia"
-  max_fsm_queue = 1000
 
 [internal_databases.mnesia]
 

test/mongoose_rdbms_SUITE.erl

@@ -137,8 +137,7 @@ unset_opts() ->
     mongoose_config:erase_opts().
 
 opts() ->
-    #{max_fsm_queue => 1024,
-      instrumentation => config_parser_helper:default_config([instrumentation])}.
+    #{instrumentation => config_parser_helper:default_config([instrumentation])}.
 
 meck_db(odbc) ->
     meck:new(eodbc, [no_link]),