diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-07-12 11:29:18 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2017-07-12 11:29:18 +0200 |
| commit | 272a5c9442e48e6dab9a6768c28171b6907a8fbe (patch) | |
| tree | b6b2911ee1c5af77ca77782d30e16a6532867c7e | |
| parent | 2a4ff1936ce0d0a47bc9ea65356a2a1c8c9f8794 (diff) | |
| parent | 1532037fec1291641d55f460046070902081b5e3 (diff) | |
| download | rabbitmq-server-git-272a5c9442e48e6dab9a6768c28171b6907a8fbe.tar.gz | |
Merge branch 'stable'rabbitmq_v3_7_0_milestone16
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | test/rabbit_core_metrics_gc_SUITE.erl | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 254dc02d73..fd2f980455 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -705,7 +705,8 @@ status() -> {erlang_version, erlang:system_info(system_version)}, {memory, rabbit_vm:memory()}, {alarms, alarms()}, - {listeners, listeners()}], + {listeners, listeners()}, + {vm_memory_calculation_strategy, vm_memory_monitor:get_memory_calculation_strategy()}], S2 = rabbit_misc:filter_exit_map( fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end, [{vm_memory_high_watermark, {vm_memory_monitor, diff --git a/test/rabbit_core_metrics_gc_SUITE.erl b/test/rabbit_core_metrics_gc_SUITE.erl index 8d15afb95c..47d47290a4 100644 --- a/test/rabbit_core_metrics_gc_SUITE.erl +++ b/test/rabbit_core_metrics_gc_SUITE.erl @@ -377,10 +377,15 @@ cluster_queue_metrics(Config) -> [queue_coarse_metrics]) end, 60), - - [{Name, 1, 0, 1, _}] = rabbit_ct_broker_helpers:rpc(Config, Node1, ets, - tab2list, - [queue_coarse_metrics]), + wait_for(fun () -> + Ret = rabbit_ct_broker_helpers:rpc( + Config, Node1, ets, tab2list, + [queue_coarse_metrics]), + case Ret of + [{Name, 1, 0, 1, _}] -> true; + _ -> false + end + end, 60), amqp_channel:call(Ch, #'queue.delete'{queue=QueueName}), rabbit_ct_client_helpers:close_channel(Ch), |