diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-06-26 08:20:03 -0700 |
|---|---|---|
| committer | Luke Bakken <luke@bakken.io> | 2017-06-28 08:19:45 -0700 |
| commit | b5d85b581fd45eb4bf36a367fd106cbbf521a1b3 (patch) | |
| tree | 44f04190b6521f895c18cab562c7a23efe4401df | |
| parent | 09805ae0a4d6ddb35459c619351c13158e9f7938 (diff) | |
| download | rabbitmq-server-git-b5d85b581fd45eb4bf36a367fd106cbbf521a1b3.tar.gz | |
Filter queue list by local pid
| -rw-r--r-- | src/rabbit_core_metrics_gc.erl | 7 | ||||
| -rw-r--r-- | test/rabbit_core_metrics_gc_SUITE.erl | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit_core_metrics_gc.erl b/src/rabbit_core_metrics_gc.erl index 3141fdc301..ee03e8f00f 100644 --- a/src/rabbit_core_metrics_gc.erl +++ b/src/rabbit_core_metrics_gc.erl @@ -25,6 +25,8 @@ -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). +-include_lib("rabbit_common/include/rabbit.hrl"). + start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). @@ -70,7 +72,10 @@ gc_channels() -> ok. gc_queues() -> - Queues = rabbit_amqqueue:list_names(), + % Queues will contain pids, we want to filter + Queues = lists:filter(fun(#amqqueue{pid = Pid}) -> + node(Pid) =:= node() + end, rabbit_amqqueue:list()), GbSet = gb_sets:from_list(Queues), gc_entity(queue_metrics, GbSet), gc_entity(queue_coarse_metrics, GbSet), diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl index dc3f8dc8eb..f60a74c315 100644 --- a/test/rabbit_core_metrics_gc_SUITE.erl +++ b/test/rabbit_core_metrics_gc_SUITE.erl @@ -392,7 +392,7 @@ cluster_queue_metrics(Config) -> % {Name, MessagesReady, MessagesUnacknowledge, Messages, Reductions} % [{{resource,<<"/">>,queue,<<"cluster_queue_metrics">>}, 1,0,1,10524}] EtsData0_0 = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, [queue_coarse_metrics]), - [{Name, 1, 0, 1, _}] = EtsData0_0, + [] = EtsData0_0, EtsData0_1 = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, [queue_coarse_metrics]), ct:pal("Node 0 ETS: ~p~n", [EtsData0_1]), |