Merge from default, to get recent work as well as support for field-array.

1 files changed, 13 insertions, 9 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 3906f2f76d..b9eede5fc1 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -141,16 +141,16 @@ start(normal, []) ->
                     check_empty_content_body_frame_size(),
 
                 ok = rabbit_alarm:start(),
-                MemoryWatermark = 
-                    application:get_env(os_mon, vm_memory_high_watermark),
-                ok = case MemoryWatermark of
-                         {ok, Float} when Float == 0 -> ok;
-                         {ok, Float} -> start_child(vm_memory_monitor, [Float]);
-                         undefined ->
-                             throw({undefined, os_mon,
-                                    vm_memory_high_watermark, settings})
+
+                {ok, MemoryWatermark} =
+                    application:get_env(vm_memory_high_watermark),
+                ok = case MemoryWatermark == 0 of
+                         true ->
+                             ok;
+                         false ->
+                             start_child(vm_memory_monitor, [MemoryWatermark])
                      end,
-                
+
                 ok = rabbit_amqqueue:start(),
 
                 ok = start_child(rabbit_router),
@@ -210,6 +210,10 @@ start(normal, []) ->
 stop(_State) ->
     terminated_ok = error_logger:delete_report_handler(rabbit_error_logger),
     ok = rabbit_alarm:stop(),
+    ok = case rabbit_mnesia:is_clustered() of
+             true  -> rabbit_amqqueue:on_node_down(node());
+             false -> rabbit_mnesia:empty_ram_only_tables()
+         end,
     ok.
 
 %---------------------------------------------------------------------------