Remove msg_store_io_batch_size and msg_store_credit_disc_bound checks

msg_store_io_batch_size is no longer used

msg_store_credit_disc_bound appears to be used in the code, but I don't
see any impact of that value on the performance. It should be properly
investigated and either removed completely or fixed, because there's
hardly any point in warning about the values configured
(plus, this settings is hopefully almost never used anyway)

Author: mkuratczyk

deps/rabbit/BUILD.bazel

@@ -95,7 +95,6 @@ _APP_ENV = """[
 	    %% writing to the queue index. See the setting
 	    %% queue_index_embed_msgs_below above.
 	    {msg_store_credit_disc_bound, {4000, 800}},
-	    {msg_store_io_batch_size, 4096},
 	    %% see rabbitmq-server#143,
 	    %% rabbitmq-server#949, rabbitmq-server#1098
 	    {credit_flow_default_credit, {400, 200}},
@@ -532,14 +531,6 @@ rabbitmq_integration_suite(
     ],
 )
 
-rabbitmq_suite(
-    name = "msg_store_SUITE",
-    size = "small",
-    deps = [
-        "//deps/rabbit_common:erlang_app",
-    ],
-)
-
 rabbitmq_integration_suite(
     name = "peer_discovery_classic_config_SUITE",
     size = "large",

deps/rabbit/Makefile

@@ -78,7 +78,6 @@ define PROJECT_ENV
 	    %% writing to the queue index. See the setting
 	    %% queue_index_embed_msgs_below above.
 	    {msg_store_credit_disc_bound, {4000, 800}},
-	    {msg_store_io_batch_size, 4096},
 	    %% see rabbitmq-server#143,
 	    %% rabbitmq-server#949, rabbitmq-server#1098
 	    {credit_flow_default_credit, {400, 200}},

deps/rabbit/app.bzl

@@ -1073,15 +1073,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         beam = ["ebin/mirrored_supervisor.beam"],
         erlc_opts = "//:test_erlc_opts",
     )
-    erlang_bytecode(
-        name = "msg_store_SUITE_beam_files",
-        testonly = True,
-        srcs = ["test/msg_store_SUITE.erl"],
-        outs = ["test/msg_store_SUITE.beam"],
-        app_name = "rabbit",
-        erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
-    )
     erlang_bytecode(
         name = "peer_discovery_classic_config_SUITE_beam_files",
         testonly = True,

deps/rabbit/ct.test.spec

@@ -61,7 +61,6 @@
 ,   metadata_store_phase1_SUITE
 ,   metrics_SUITE
 ,   mirrored_supervisor_SUITE
-,   msg_store_SUITE
 ,   peer_discovery_classic_config_SUITE
 ]}.
 

deps/rabbit/src/rabbit.erl

@@ -42,9 +42,6 @@
          pg_local_amqp_session/0,
          pg_local_amqp_connection/0]).
 
-%% for tests
--export([validate_msg_store_io_batch_size_and_credit_disc_bound/2]).
-
 -rabbit_boot_step({pre_boot, [{description, "rabbit boot start"}]}).
 
 -rabbit_boot_step({codec_correctness_check,
@@ -969,7 +966,6 @@ start(normal, []) ->
         print_banner(),
         log_banner(),
         warn_if_kernel_config_dubious(),
-        warn_if_disc_io_options_dubious(),
 
         ?LOG_DEBUG(""),
         ?LOG_DEBUG("== Plugins (prelaunch phase) =="),
@@ -1443,87 +1439,6 @@ warn_if_kernel_config_dubious() ->
         true  -> ok
     end.
 
-warn_if_disc_io_options_dubious() ->
-    %% if these values are not set, it doesn't matter since
-    %% rabbit_variable_queue will pick up the values defined in the
-    %% IO_BATCH_SIZE and CREDIT_DISC_BOUND constants.
-    CreditDiscBound = rabbit_misc:get_env(rabbit, msg_store_credit_disc_bound,
-                                          undefined),
-    IoBatchSize = rabbit_misc:get_env(rabbit, msg_store_io_batch_size,
-                                      undefined),
-    case catch validate_msg_store_io_batch_size_and_credit_disc_bound(
-                 CreditDiscBound, IoBatchSize) of
-        ok -> ok;
-        {error, {Reason, Vars}} ->
-            ?LOG_WARNING(Reason, Vars,
-                         #{domain => ?RMQLOG_DOMAIN_GLOBAL})
-    end.
-
-validate_msg_store_io_batch_size_and_credit_disc_bound(CreditDiscBound,
-                                                       IoBatchSize) ->
-    case IoBatchSize of
-        undefined ->
-            ok;
-        IoBatchSize when is_integer(IoBatchSize) ->
-            if IoBatchSize < ?IO_BATCH_SIZE ->
-                    throw({error,
-                     {"io_batch_size of ~b lower than recommended value ~b, "
-                      "paging performance may worsen",
-                      [IoBatchSize, ?IO_BATCH_SIZE]}});
-               true ->
-                    ok
-            end;
-        IoBatchSize ->
-            throw({error,
-             {"io_batch_size should be an integer, but ~b given",
-              [IoBatchSize]}})
-    end,
-
-    %% CreditDiscBound = {InitialCredit, MoreCreditAfter}
-    {RIC, RMCA} = ?CREDIT_DISC_BOUND,
-    case CreditDiscBound of
-        undefined ->
-            ok;
-        {IC, MCA} when is_integer(IC), is_integer(MCA) ->
-            if IC < RIC; MCA < RMCA ->
-                    throw({error,
-                     {"msg_store_credit_disc_bound {~b, ~b} lower than"
-                      "recommended value {~b, ~b},"
-                      " paging performance may worsen",
-                      [IC, MCA, RIC, RMCA]}});
-               true ->
-                    ok
-            end;
-        {IC, MCA} ->
-            throw({error,
-             {"both msg_store_credit_disc_bound values should be integers, but ~tp given",
-              [{IC, MCA}]}});
-        CreditDiscBound ->
-            throw({error,
-             {"invalid msg_store_credit_disc_bound value given: ~tp",
-              [CreditDiscBound]}})
-    end,
-
-    case {CreditDiscBound, IoBatchSize} of
-        {undefined, undefined} ->
-            ok;
-        {_CDB, undefined} ->
-            ok;
-        {undefined, _IBS} ->
-            ok;
-        {{InitialCredit, _MCA}, IoBatchSize} ->
-            if IoBatchSize < InitialCredit ->
-                    throw(
-                      {error,
-                       {"msg_store_io_batch_size ~b should be bigger than the initial "
-                        "credit value from msg_store_credit_disc_bound ~b,"
-                        " paging performance may worsen",
-                        [IoBatchSize, InitialCredit]}});
-               true ->
-                    ok
-            end
-    end.
-
 -spec product_name() -> string().
 
 product_name() ->

deps/rabbit/src/rabbit_variable_queue.erl

@@ -210,7 +210,7 @@
           disk_read_count,
           disk_write_count,
 
-          io_batch_size,
+          io_batch_size, %% Unused.
 
           %% default queue or lazy queue
           mode, %% Unused.
@@ -334,7 +334,7 @@
              disk_read_count       :: non_neg_integer(),
              disk_write_count      :: non_neg_integer(),
 
-             io_batch_size         :: pos_integer(),
+             io_batch_size         :: 0,
              mode                  :: 'default' | 'lazy',
              version               :: 2,
              unconfirmed_simple    :: sets:set()}.
@@ -1195,8 +1195,6 @@ init(IsDurable, IndexState, StoreState, DeltaCount, DeltaBytes, Terms,
                                     end_seq_id   = NextSeqId })
             end,
     Now = erlang:monotonic_time(),
-    IoBatchSize = rabbit_misc:get_env(rabbit, msg_store_io_batch_size,
-                                      ?IO_BATCH_SIZE),
 
     {ok, IndexMaxSize} = application:get_env(
                            rabbit, queue_index_embed_msgs_below),
@@ -1242,7 +1240,7 @@ init(IsDurable, IndexState, StoreState, DeltaCount, DeltaBytes, Terms,
       disk_read_count     = 0,
       disk_write_count    = 0,
 
-      io_batch_size       = IoBatchSize,
+      io_batch_size       = 0,
 
       mode                = default,
       virtual_host        = VHost},