diff options
| author | kjnilsson <knilsson@pivotal.io> | 2017-07-04 11:55:37 +0100 |
|---|---|---|
| committer | kjnilsson <knilsson@pivotal.io> | 2017-07-04 14:45:11 +0100 |
| commit | 0e9b333b64928ec17b5054ad4c9aece1539f0037 (patch) | |
| tree | bd25cef8e5d7bba59deb0301dff836b484764942 /test | |
| parent | 744e6991d226e87904672b227230732de59cc322 (diff) | |
| download | rabbitmq-server-git-0e9b333b64928ec17b5054ad4c9aece1539f0037.tar.gz | |
Clean up queue metrics on queue termination.
This change handles all non-crash termination cases. The assumption here
is that once an amqqueue_process terminates the master is no longer on
the current node.
[#147753285]
Diffstat (limited to 'test')
| -rw-r--r-- | test/rabbit_core_metrics_gc_SUITE.erl | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl index 2540e5cd3e..d63c9ab2fb 100644 --- a/test/rabbit_core_metrics_gc_SUITE.erl +++ b/test/rabbit_core_metrics_gc_SUITE.erl @@ -343,11 +343,6 @@ cluster_queue_metrics(Config) -> Node0 = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), Node1 = rabbit_ct_broker_helpers:get_node_config(Config, 1, nodename), - rabbit_ct_broker_helpers:rpc(Config, Node0, erlang, send, [rabbit_core_metrics_gc, start_gc]), - rabbit_ct_broker_helpers:rpc(Config, Node0, gen_server, call, [rabbit_core_metrics_gc, test]), - rabbit_ct_broker_helpers:rpc(Config, Node1, erlang, send, [rabbit_core_metrics_gc, start_gc]), - rabbit_ct_broker_helpers:rpc(Config, Node1, gen_server, call, [rabbit_core_metrics_gc, test]), - Ch = rabbit_ct_client_helpers:open_channel(Config, Node0), Node0Name = rabbit_data_coercion:to_binary(Node0), @@ -370,24 +365,21 @@ cluster_queue_metrics(Config) -> % Synchronize Name = rabbit_misc:r(VHost, queue, QueueName), [#amqqueue{pid = QPid}] = rabbit_ct_broker_helpers:rpc(Config, Node0, - ets, lookup, [rabbit_queue, Name]), - ok = rabbit_ct_broker_helpers:rpc(Config, Node0, rabbit_amqqueue, sync_mirrors, [QPid]), - - timer:sleep(1000), + ets, lookup, + [rabbit_queue, Name]), + ok = rabbit_ct_broker_helpers:rpc(Config, Node0, rabbit_amqqueue, + sync_mirrors, [QPid]), - rabbit_ct_broker_helpers:rpc(Config, Node0, erlang, send, [rabbit_core_metrics_gc, start_gc]), - rabbit_ct_broker_helpers:rpc(Config, Node0, gen_server, call, [rabbit_core_metrics_gc, test]), - rabbit_ct_broker_helpers:rpc(Config, Node1, erlang, send, [rabbit_core_metrics_gc, start_gc]), - rabbit_ct_broker_helpers:rpc(Config, Node1, gen_server, call, [rabbit_core_metrics_gc, test]), + timer:sleep(1500), % Check ETS table for data % rabbit_core_metrics:queue_stats - % {Name, MessagesReady, MessagesUnacknowledge, Messages, Reductions} - % [{{resource,<<"/">>,queue,<<"cluster_queue_metrics">>}, 1,0,1,10524}] - [] = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, [queue_coarse_metrics]), + [] = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, + [queue_coarse_metrics]), - EtsData1_0 = rabbit_ct_broker_helpers:rpc(Config, Node1, ets, tab2list, [queue_coarse_metrics]), - [{Name, 1, 0, 1, _}] = EtsData1_0, + [{Name, 1, 0, 1, _}] = rabbit_ct_broker_helpers:rpc(Config, Node1, ets, + tab2list, + [queue_coarse_metrics]), amqp_channel:call(Ch, #'queue.delete'{queue=QueueName}), rabbit_ct_client_helpers:close_channel(Ch), |