summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ebin/rabbit_app.in2
-rw-r--r--src/rabbit_tests.erl15
2 files changed, 15 insertions, 2 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in
index 0ada27d4ea..95d59b43e4 100644
--- a/ebin/rabbit_app.in
+++ b/ebin/rabbit_app.in
@@ -23,7 +23,7 @@
{persister_max_wrap_entries, 500},
{persister_hibernate_after, 10000},
{msg_store_file_size_limit, 16777216},
- {queue_index_max_journal_entry_count, 262144},
+ {queue_index_max_journal_entries, 262144},
{default_user, <<"guest">>},
{default_pass, <<"guest">>},
{default_vhost, <<"/">>},
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 36fa855ac3..dce4d46e7c 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1311,10 +1311,23 @@ extra_arg_hook(Hookname, Handler, Args, Extra1, Extra2) ->
test_backing_queue() ->
case application:get_env(rabbit, backing_queue_module) of
{ok, rabbit_variable_queue} ->
+ {ok, FileSizeLimit} =
+ application:get_env(rabbit, msg_store_file_size_limit),
+ application:set_env(rabbit, msg_store_file_size_limit, 128,
+ infinity),
+ {ok, MaxJournal} =
+ application:get_env(rabbit, queue_index_max_journal_entries),
+ application:set_env(rabbit, queue_index_max_journal_entries, 128,
+ infinity),
passed = test_msg_store(),
+ application:set_env(rabbit, msg_store_file_size_limit,
+ FileSizeLimit, infinity),
passed = test_queue_index(),
passed = test_variable_queue(),
- passed = test_queue_recover();
+ passed = test_queue_recover(),
+ application:set_env(rabbit, queue_index_max_journal_entries,
+ MaxJournal, infinity),
+ passed;
_ ->
passed
end.