diff options
| -rw-r--r-- | src/rabbit.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_sync.erl | 2 | ||||
| -rw-r--r-- | test/priority_queue_SUITE.erl | 26 |
3 files changed, 28 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 588774a7a9..8498e54c09 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -95,8 +95,8 @@ [{description, "core metrics storage"}, {mfa, {rabbit_sup, start_child, [rabbit_metrics]}}, - {requires, external_infrastructure}, - {enables, kernel_ready}]}). + {requires, pre_boot}, + {enables, external_infrastructure}]}). -rabbit_boot_step({rabbit_event, [{description, "statistics event manager"}, diff --git a/src/rabbit_mirror_queue_sync.erl b/src/rabbit_mirror_queue_sync.erl index d6357e0dc0..2994e8cbcf 100644 --- a/src/rabbit_mirror_queue_sync.erl +++ b/src/rabbit_mirror_queue_sync.erl @@ -37,7 +37,7 @@ %% %% Master Syncer Slave(s) %% sync_mirrors -> || || -%% (from channel) || -- (spawns) --> || || +%% || -- (spawns) --> || || %% || --------- sync_start (over GM) -------> || %% || || <--- sync_ready ---- || %% || || (or) || diff --git a/test/priority_queue_SUITE.erl b/test/priority_queue_SUITE.erl index 8e1b48dd3b..eecd59b879 100644 --- a/test/priority_queue_SUITE.erl +++ b/test/priority_queue_SUITE.erl @@ -44,7 +44,8 @@ groups() -> resume, simple_order, straight_through, - invoke + invoke, + gen_server2_stats ]}, {cluster_size_3, [], [ mirror_queue_auto_ack, @@ -214,6 +215,29 @@ invoke(Config) -> rabbit_ct_client_helpers:close_connection(Conn), passed. + +gen_server2_stats(Config) -> + %% Synthetic test to check the invoke callback, as the bug tested here + %% is only triggered with a race condition. + %% When mirroring is stopped, the backing queue of rabbit_amqqueue_process + %% changes from rabbit_mirror_queue_master to rabbit_priority_queue, + %% which shouldn't receive any invoke call. However, there might + %% be pending messages so the priority queue receives the + %% `run_backing_queue` cast message sent to the old master. + A = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), + {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, A), + Q = <<"gen_server2_stats_queue">>, + declare(Ch, Q, 3), + Pid = queue_pid(Config, A, rabbit_misc:r(<<"/">>, queue, Q)), + Metrics = rabbit_ct_broker_helpers:rpc( + Config, A, rabbit_core_metrics, get_gen_server2_stats, + [Pid]), + true = is_number(Metrics), + delete(Ch, Q), + rabbit_ct_client_helpers:close_channel(Ch), + rabbit_ct_client_helpers:close_connection(Conn), + passed. + dropwhile_fetchwhile(Config) -> {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0), Q = <<"dropwhile_fetchwhile-queue">>, |