diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-06-23 18:37:07 -0700 |
|---|---|---|
| committer | Luke Bakken <luke@bakken.io> | 2017-06-28 08:19:45 -0700 |
| commit | 5864443b10b26b7f6b7eec652ffa1e1f43c26bcb (patch) | |
| tree | 0d5cbe16ae3f8cf4cc5825c0bbc7e5f0096f7fbf | |
| parent | 1c48e50d6613f658917ef029ff865b2899120066 (diff) | |
| download | rabbitmq-server-git-5864443b10b26b7f6b7eec652ffa1e1f43c26bcb.tar.gz | |
Add sleep to ensure sync_mirrors settles
| -rw-r--r-- | test/rabbit_core_metrics_gc_SUITE.erl | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl index 69a335bbe6..92f0ff3cbe 100644 --- a/test/rabbit_core_metrics_gc_SUITE.erl +++ b/test/rabbit_core_metrics_gc_SUITE.erl @@ -343,16 +343,16 @@ cluster_queue_metrics(Config) -> Node0 = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), Ch = rabbit_ct_client_helpers:open_channel(Config, Node0), - amqp_channel:call(Ch, #'queue.declare'{queue = QueueName}), - amqp_channel:call(Ch, #'basic.publish'{routing_key = QueueName}, - #amqp_msg{payload = <<"hello">>}), - Node0Name = rabbit_data_coercion:to_binary(Node0), Definition0 = [{<<"ha-mode">>, <<"nodes">>}, {<<"ha-params">>, [Node0Name]}], ok = rabbit_ct_broker_helpers:set_policy(Config, 0, PolicyName, PolicyPattern, PolicyAppliesTo, Definition0), + amqp_channel:call(Ch, #'queue.declare'{queue = QueueName}), + amqp_channel:call(Ch, #'basic.publish'{routing_key = QueueName}, + #amqp_msg{payload = <<"hello">>}), + % Update policy to point to other node Node1 = rabbit_ct_broker_helpers:get_node_config(Config, 1, nodename), Node1Name = rabbit_data_coercion:to_binary(Node1), @@ -367,6 +367,13 @@ cluster_queue_metrics(Config) -> ets, lookup, [rabbit_queue, Name]), ok = rabbit_ct_broker_helpers:rpc(Config, Node0, rabbit_amqqueue, sync_mirrors, [QPid]), + timer:sleep(1000), + + 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]), + % Check ETS table for data % rabbit_core_metrics:queue_stats % {Name, MessagesReady, MessagesUnacknowledge, Messages, Reductions} @@ -374,9 +381,6 @@ cluster_queue_metrics(Config) -> EtsData0_0 = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, [queue_coarse_metrics]), [{Name, 1, 0, 1, _}] = EtsData0_0, - 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]), - EtsData0_1 = rabbit_ct_broker_helpers:rpc(Config, Node0, ets, tab2list, [queue_coarse_metrics]), ct:pal("Node 0 ETS: ~p~n", [EtsData0_1]), [{Name, 1, 0, 1, _}] = EtsData0_1, |