Merge branch 'stable'

Author: dumbbell

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,

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),