Skip to content

Commit ec7f018

Browse files
committed
Tweak qourum queue tick interval for tests
As some tests use metrics to assert on and quorum queues only emit metrics every 5s by default. This change takes it down to 1s for selected suites. It also introduces a new `quorum_tick_interval` application parameter to set this interval.
1 parent a19d77f commit ec7f018

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/rabbit_quorum_queue.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ declare(Q) when ?amqqueue_is_quorum(Q) ->
120120
RaMachine = ra_machine(NewQ),
121121
ServerIds = [{RaName, Node} || Node <- Nodes],
122122
ClusterName = RaName,
123+
TickTimeout = application:get_env(rabbit, quorum_tick_interval, ?TICK_TIMEOUT),
123124
RaConfs = [begin
124125
UId = ra:new_uid(ra_lib:to_binary(ClusterName)),
125126
FName = rabbit_misc:rs(QName),
@@ -129,7 +130,7 @@ declare(Q) when ?amqqueue_is_quorum(Q) ->
129130
friendly_name => FName,
130131
initial_members => ServerIds,
131132
log_init_args => #{uid => UId},
132-
tick_timeout => ?TICK_TIMEOUT,
133+
tick_timeout => TickTimeout,
133134
machine => RaMachine}
134135
end || ServerId <- ServerIds],
135136

test/quorum_queue_SUITE.erl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,10 @@ memory_tests() ->
126126
%% Testsuite setup/teardown.
127127
%% -------------------------------------------------------------------
128128

129-
init_per_suite(Config) ->
129+
init_per_suite(Config0) ->
130130
rabbit_ct_helpers:log_environment(),
131+
Config = rabbit_ct_helpers:merge_app_env(
132+
Config0, {rabbit, [{quorum_tick_interval, 1000}]}),
131133
rabbit_ct_helpers:run_setup_steps(
132134
Config,
133135
[fun rabbit_ct_broker_helpers:enable_dist_proxy_manager/1]).

test/single_active_consumer_SUITE.erl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ groups() ->
4545
]}
4646
].
4747

48-
init_per_suite(Config) ->
48+
init_per_suite(Config0) ->
4949
rabbit_ct_helpers:log_environment(),
50-
Config1 = rabbit_ct_helpers:set_config(Config, [
50+
Config1 = rabbit_ct_helpers:set_config(Config0, [
5151
{rmq_nodename_suffix, ?MODULE}
5252
]),
53-
rabbit_ct_helpers:run_setup_steps(Config1,
53+
Config = rabbit_ct_helpers:merge_app_env(
54+
Config1, {rabbit, [{quorum_tick_interval, 1000}]}),
55+
rabbit_ct_helpers:run_setup_steps(Config,
5456
rabbit_ct_broker_helpers:setup_steps() ++
5557
rabbit_ct_client_helpers:setup_steps()).
5658

0 commit comments

Comments
 (0)