merge default into bug19900bug19900

9 files changed, 304 insertions, 65 deletions

diff --git a/src/rabbit_alarm.erl b/src/rabbit_alarm.erl
index c2d6aaff..6d65b3a4 100644
--- a/src/rabbit_alarm.erl
+++ b/src/rabbit_alarm.erl
@@ -50,22 +50,57 @@
 %%----------------------------------------------------------------------------
 
 start() ->
+    ok = alarm_handler:add_alarm_handler(?MODULE),
+    case whereis(memsup) of
+        undefined ->
+            Mod = case os:type() of 
+                      %% memsup doesn't take account of buffers or
+                      %% cache when considering "free" memory -
+                      %% therefore on Linux we can get memory alarms
+                      %% very easily without any pressure existing on
+                      %% memory at all. Therefore we need to use our
+                      %% own simple memory monitor.
+                      %%
+                      {unix, linux} -> rabbit_memsup_linux;
+
+                      %% Start memsup programmatically rather than via
+                      %% the rabbitmq-server script. This is not quite
+                      %% the right thing to do as os_mon checks to see
+                      %% if memsup is available before starting it,
+                      %% but as memsup is available everywhere (even
+                      %% on VXWorks) it should be ok.
+                      %%
+                      %% One benefit of the programmatic startup is
+                      %% that we can add our alarm_handler before
+                      %% memsup is running, thus ensuring that we
+                      %% notice memory alarms that go off on startup.
+                      %%
+                      _             -> memsup
+                  end,
+            %% This is based on os_mon:childspec(memsup, true)
+            {ok, _} = supervisor:start_child(
+                        os_mon_sup,
+                        {memsup, {Mod, start_link, []},
+                         permanent, 2000, worker, [Mod]}),
+            ok;
+        _ ->
+            ok
+    end,
     %% The default memsup check interval is 1 minute, which is way too
-    %% long - rabbit can gobble up all memory in a matter of
-    %% seconds. Unfortunately the memory_check_interval configuration
-    %% parameter and memsup:set_check_interval/1 function only provide
-    %% a granularity of minutes. So we have to peel off one layer of
-    %% the API to get to the underlying layer which operates at the
+    %% long - rabbit can gobble up all memory in a matter of seconds.
+    %% Unfortunately the memory_check_interval configuration parameter
+    %% and memsup:set_check_interval/1 function only provide a
+    %% granularity of minutes. So we have to peel off one layer of the
+    %% API to get to the underlying layer which operates at the
     %% granularity of milliseconds.
     %%
     %% Note that the new setting will only take effect after the first
     %% check has completed, i.e. after one minute. So if rabbit eats
     %% all the memory within the first minute after startup then we
     %% are out of luck.
-    ok = os_mon:call(memsup, {set_check_interval, ?MEMSUP_CHECK_INTERVAL},
-                     infinity),
-
-    ok = alarm_handler:add_alarm_handler(?MODULE).
+    ok = os_mon:call(memsup,
+                     {set_check_interval, ?MEMSUP_CHECK_INTERVAL},
+                     infinity).
 
 stop() ->
     ok = alarm_handler:delete_alarm_handler(?MODULE).
@@ -77,9 +112,7 @@ register(Pid, HighMemMFA) ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
-    HWM = system_memory_high_watermark(),
-    {ok, #alarms{alertees = dict:new(),
-                 system_memory_high_watermark = HWM}}.
+    {ok, #alarms{alertees = dict:new()}}.
 
 handle_call({register, Pid, HighMemMFA},
             State = #alarms{alertees = Alertess}) ->
@@ -121,19 +154,6 @@ code_change(_OldVsn, State, _Extra) ->
 
 %%----------------------------------------------------------------------------
 
-system_memory_high_watermark() ->
-    %% When we register our alarm_handler, the
-    %% system_memory_high_watermark alarm may already have gone
-    %% off. How do we find out about that? Calling
-    %% alarm_handler:get_alarms() would deadlock. So instead we ask
-    %% memsup. Unfortunately that doesn't expose a suitable API, so we
-    %% have to reach quite deeply into its internals.
-    {dictionary, D} = process_info(whereis(memsup), dictionary),
-    case lists:keysearch(system_memory_high_watermark, 1, D) of
-        {value, {_, set}} -> true;
-        _Other            -> false
-    end.
-
 alert(Alert, Alertees) ->
     dict:fold(fun (Pid, {M, F, A}, Acc) ->
                       ok = erlang:apply(M, F, A ++ [Pid, Alert]),
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 2f7e58e0..b821fa0d 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -35,23 +35,40 @@
 start() ->
     FullCommand = init:get_plain_arguments(),
     #params{quiet = Quiet, node = Node, command = Command, args = Args} = 
-        parse_args(FullCommand, #params{quiet = false, node = rabbit_misc:localnode(rabbit)}),
-    Inform = case Quiet of   
-                true -> fun(_Format, _Data) -> ok end;
-                false -> fun io:format/2
+        parse_args(FullCommand, #params{quiet = false,
+                                        node = rabbit_misc:localnode(rabbit)}),
+    Inform = case Quiet of
+                 true  -> fun(_Format, _Args1) -> ok end;
+                 false -> fun(Format, Args1) ->
+                                  io:format(Format ++ " ...~n", Args1)
+                         end
              end,
+    %% The reason we don't use a try/catch here is that rpc:call turns
+    %% thrown errors into normal return values
     case catch action(Command, Node, Args, Inform) of
         ok ->
-            Inform("done.~n", []),
+            case Quiet of
+                true  -> ok;
+                false -> io:format("...done.~n")
+            end,
             init:stop();
         {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} ->
-            io:format("Error~nInvalid command ~p~n", [FullCommand]),
+            error("invalid command '~s'",
+                  [lists:flatten(
+                     rabbit_misc:intersperse(
+                       " ", [atom_to_list(Command) | Args]))]),
             usage();
+        {error, Reason} ->
+            error("~p", [Reason]),
+            halt(2);
         Other ->
-            io:format("Error~nrabbit_control action ~p failed:~n~p~n", [Command, Other]),
+            error("~p", [Other]),
             halt(2)
     end.
 
+error(Format, Args) ->
+    rabbit_misc:format_stderr("Error: " ++ Format ++ "~n", Args).
+
 parse_args(["-n", NodeS | Args], Params) ->
     Node = case lists:member($@, NodeS) of
                true  -> list_to_atom(NodeS);
@@ -109,86 +126,86 @@ output of hostname -s is usually the correct suffix to use after the \"@\" sign.
     halt(1).
 
 action(stop, Node, [], Inform) ->
-    Inform("Stopping and halting node ~p ...~n", [Node]),
+    Inform("Stopping and halting node ~p", [Node]),
     call(Node, {rabbit, stop_and_halt, []});
 
 action(stop_app, Node, [], Inform) ->
-    Inform("Stopping node ~p ...~n", [Node]),
+    Inform("Stopping node ~p", [Node]),
     call(Node, {rabbit, stop, []});
 
 action(start_app, Node, [], Inform) ->
-    Inform("Starting node ~p ...~n", [Node]),
+    Inform("Starting node ~p", [Node]),
     call(Node, {rabbit, start, []});
 
 action(reset, Node, [], Inform) ->
-    Inform("Resetting node ~p ...~n", [Node]),
+    Inform("Resetting node ~p", [Node]),
     call(Node, {rabbit_mnesia, reset, []});
 
 action(force_reset, Node, [], Inform) ->
-    Inform("Forcefully resetting node ~p ...~n", [Node]),
+    Inform("Forcefully resetting node ~p", [Node]),
     call(Node, {rabbit_mnesia, force_reset, []});
 
 action(cluster, Node, ClusterNodeSs, Inform) ->
     ClusterNodes = lists:map(fun list_to_atom/1, ClusterNodeSs),
-    Inform("Clustering node ~p with ~p ...~n",
+    Inform("Clustering node ~p with ~p",
               [Node, ClusterNodes]),
     rpc_call(Node, rabbit_mnesia, cluster, [ClusterNodes]);
 
 action(status, Node, [], Inform) ->
-    Inform("Status of node ~p ...~n", [Node]),
+    Inform("Status of node ~p", [Node]),
     Res = call(Node, {rabbit, status, []}),
     io:format("~p~n", [Res]),
     ok;
 
 action(rotate_logs, Node, [], Inform) ->
-    Inform("Reopening logs for node ~p ...~n", [Node]),
+    Inform("Reopening logs for node ~p", [Node]),
     call(Node, {rabbit, rotate_logs, [""]});
 action(rotate_logs, Node, Args = [Suffix], Inform) ->
-    Inform("Rotating logs to files with suffix ~p ...~n", [Suffix]),
+    Inform("Rotating logs to files with suffix ~p", [Suffix]),
     call(Node, {rabbit, rotate_logs, Args});
 
 action(add_user, Node, Args = [Username, _Password], Inform) ->
-    Inform("Creating user ~p ...~n", [Username]),
+    Inform("Creating user ~p", [Username]),
     call(Node, {rabbit_access_control, add_user, Args});
 
 action(delete_user, Node, Args = [_Username], Inform) ->
-    Inform("Deleting user ~p ...~n", Args),
+    Inform("Deleting user ~p", Args),
     call(Node, {rabbit_access_control, delete_user, Args});
 
 action(change_password, Node, Args = [Username, _Newpassword], Inform) ->
-    Inform("Changing password for user ~p ...~n", [Username]),
+    Inform("Changing password for user ~p", [Username]),
     call(Node, {rabbit_access_control, change_password, Args});
 
 action(list_users, Node, [], Inform) ->
-    Inform("Listing users ...~n", []),
+    Inform("Listing users", []),
     display_list(call(Node, {rabbit_access_control, list_users, []}));
 
 action(add_vhost, Node, Args = [_VHostPath], Inform) ->
-    Inform("Creating vhost ~p ...~n", Args),
+    Inform("Creating vhost ~p", Args),
     call(Node, {rabbit_access_control, add_vhost, Args});
 
 action(delete_vhost, Node, Args = [_VHostPath], Inform) ->
-    Inform("Deleting vhost ~p ...~n", Args),
+    Inform("Deleting vhost ~p", Args),
     call(Node, {rabbit_access_control, delete_vhost, Args});
 
 action(list_vhosts, Node, [], Inform) ->
-    Inform("Listing vhosts ...~n", []),
+    Inform("Listing vhosts", []),
     display_list(call(Node, {rabbit_access_control, list_vhosts, []}));
 
 action(map_user_vhost, Node, Args = [_Username, _VHostPath], Inform) ->
-    Inform("Mapping user ~p to vhost ~p ...~n", Args),
+    Inform("Mapping user ~p to vhost ~p", Args),
     call(Node, {rabbit_access_control, map_user_vhost, Args});
 
 action(unmap_user_vhost, Node, Args = [_Username, _VHostPath], Inform) ->
-    Inform("Unmapping user ~p from vhost ~p ...~n", Args),
+    Inform("Unmapping user ~p from vhost ~p", Args),
     call(Node, {rabbit_access_control, unmap_user_vhost, Args});
 
 action(list_user_vhosts, Node, Args = [_Username], Inform) ->
-    Inform("Listing vhosts for user ~p...~n", Args),
+    Inform("Listing vhosts for user ~p", Args),
     display_list(call(Node, {rabbit_access_control, list_user_vhosts, Args}));
 
 action(list_vhost_users, Node, Args = [_VHostPath], Inform) ->
-    Inform("Listing users for vhosts ~p...~n", Args),
+    Inform("Listing users for vhosts ~p", Args),
     display_list(call(Node, {rabbit_access_control, list_vhost_users, Args})).
 
 display_list(L) when is_list(L) ->
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl
index a8f839f0..b4729230 100644
--- a/src/rabbit_log.erl
+++ b/src/rabbit_log.erl
@@ -32,7 +32,7 @@
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 
--export([debug/1, debug/2, info/1, info/2,
+-export([debug/1, debug/2, message/4, info/1, info/2,
          warning/1, warning/2, error/1, error/2]).
 
 -import(io).
@@ -67,6 +67,10 @@ debug(Fmt) ->
 debug(Fmt, Args) when is_list(Args) ->
     gen_server:cast(?SERVER, {debug, Fmt, Args}).
 
+message(Direction, Channel, MethodRecord, Content) ->
+    gen_server:cast(?SERVER,
+		    {message, Direction, Channel, MethodRecord, Content}).
+
 info(Fmt) ->
     gen_server:cast(?SERVER, {info, Fmt}).
 
@@ -100,6 +104,14 @@ handle_cast({debug, Fmt, Args}, State) ->
     io:format("debug:: "), io:format(Fmt, Args),
     error_logger:info_msg("debug:: " ++ Fmt, Args),
     {noreply, State};
+handle_cast({message, Direction, Channel, MethodRecord, Content}, State) ->
+    io:format("~s ch~p ~p~n",
+	      [case Direction of
+		   in -> "-->";
+		   out -> "<--" end,
+	       Channel,
+	       {MethodRecord, Content}]),
+    {noreply, State};
 handle_cast({info, Fmt}, State) ->
     error_logger:info_msg(Fmt),
     {noreply, State};
diff --git a/src/rabbit_memsup_linux.erl b/src/rabbit_memsup_linux.erl
new file mode 100644
index 00000000..b77ffcab
--- /dev/null
+++ b/src/rabbit_memsup_linux.erl
@@ -0,0 +1,150 @@
+%%   The contents of this file are subject to the Mozilla Public License
+%%   Version 1.1 (the "License"); you may not use this file except in
+%%   compliance with the License. You may obtain a copy of the License at
+%%   http://www.mozilla.org/MPL/
+%%
+%%   Software distributed under the License is distributed on an "AS IS"
+%%   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+%%   License for the specific language governing rights and limitations
+%%   under the License.
+%%
+%%   The Original Code is RabbitMQ.
+%%
+%%   The Initial Developers of the Original Code are LShift Ltd.,
+%%   Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd.
+%%
+%%   Portions created by LShift Ltd., Cohesive Financial Technologies
+%%   LLC., and Rabbit Technologies Ltd. are Copyright (C) 2007-2008
+%%   LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit
+%%   Technologies Ltd.;
+%%
+%%   All Rights Reserved.
+%%
+%%   Contributor(s): ______________________________________.
+%%
+
+-module(rabbit_memsup_linux).
+
+-behaviour(gen_server).
+
+-export([start_link/0]).
+
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+
+-export([update/0]).
+
+-define(SERVER, memsup). %% must be the same as the standard memsup
+
+-define(DEFAULT_MEMORY_CHECK_INTERVAL, 1000).
+
+-record(state, {memory_fraction, alarmed, timeout, timer}).   
+
+%%----------------------------------------------------------------------------
+
+-ifdef(use_specs).
+
+-spec(start_link/0 :: () -> {'ok', pid()} | 'ignore' | {'error', any()}).
+-spec(update/0 :: () -> 'ok').
+     
+-endif.
+
+%%----------------------------------------------------------------------------
+
+start_link() ->
+    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+
+update() ->
+    gen_server:cast(?SERVER, update).
+
+%%----------------------------------------------------------------------------
+
+init(_Args) -> 
+    Fraction = os_mon:get_env(memsup, system_memory_high_watermark),
+    TRef = start_timer(?DEFAULT_MEMORY_CHECK_INTERVAL),
+    {ok, #state{alarmed = false, 
+                memory_fraction = Fraction, 
+                timeout = ?DEFAULT_MEMORY_CHECK_INTERVAL,
+                timer = TRef}}.
+
+start_timer(Timeout) ->
+    {ok, TRef} = timer:apply_interval(Timeout, ?MODULE, update, []),
+    TRef.
+
+%% Export the same API as the real memsup. Note that
+%% get_sysmem_high_watermark gives an int in the range 0 - 100, while
+%% set_sysmem_high_watermark takes a float in the range 0.0 - 1.0.
+handle_call(get_sysmem_high_watermark, _From, State) ->
+    {reply, trunc(100 * State#state.memory_fraction), State};
+
+handle_call({set_sysmem_high_watermark, Float}, _From, State) ->
+    {reply, ok, State#state{memory_fraction = Float}};
+
+handle_call(get_check_interval, _From, State) ->
+    {reply, State#state.timeout, State};
+
+handle_call({set_check_interval, Timeout}, _From, State) ->
+    {ok, cancel} = timer:cancel(State#state.timer),
+    {reply, ok, State#state{timeout = Timeout, timer = start_timer(Timeout)}};
+
+handle_call(_Request, _From, State) -> 
+    {noreply, State}.
+
+handle_cast(update, State = #state{alarmed = Alarmed,
+                                   memory_fraction = MemoryFraction}) -> 
+    File = read_proc_file("/proc/meminfo"),
+    Lines = string:tokens(File, "\n"),
+    Dict = dict:from_list(lists:map(fun parse_line/1, Lines)),
+    MemTotal = dict:fetch('MemTotal', Dict),
+    MemUsed = MemTotal
+        - dict:fetch('MemFree', Dict)
+        - dict:fetch('Buffers', Dict)
+        - dict:fetch('Cached', Dict),
+    NewAlarmed = MemUsed / MemTotal > MemoryFraction,
+    case {Alarmed, NewAlarmed} of
+        {false, true} ->
+            alarm_handler:set_alarm({system_memory_high_watermark, []});
+        {true, false} ->
+            alarm_handler:clear_alarm(system_memory_high_watermark);
+        _ ->
+            ok
+    end,
+    {noreply,  State#state{alarmed = NewAlarmed}};
+
+handle_cast(_Request, State) -> 
+    {noreply, State}.
+
+handle_info(_Info, State) -> 
+    {noreply, State}.
+
+terminate(_Reason, _State) -> 
+    ok.
+
+code_change(_OldVsn, State, _Extra) -> 
+    {ok, State}.
+
+%%----------------------------------------------------------------------------
+
+-define(BUFFER_SIZE, 1024).
+
+%% file:read_file does not work on files in /proc as it seems to get
+%% the size of the file first and then read that many bytes. But files
+%% in /proc always have length 0, we just have to read until we get
+%% eof.
+read_proc_file(File) ->
+    {ok, IoDevice} = file:open(File, [read, raw]),
+    Res = read_proc_file(IoDevice, []),
+    file:close(IoDevice),
+    lists:flatten(lists:reverse(Res)).
+    
+read_proc_file(IoDevice, Acc) ->
+    case file:read(IoDevice, ?BUFFER_SIZE) of
+        {ok, Res} -> read_proc_file(IoDevice, [Res | Acc]);
+        eof       -> Acc
+    end.
+
+%% A line looks like "FooBar: 123456 kB"
+parse_line(Line) ->
+    [Name, Value | _] = string:tokens(Line, ": "),   
+    {list_to_atom(Name), list_to_integer(Value)}.
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index cdd80594..6be73e43 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -43,6 +43,7 @@
 -export([guid/0, string_guid/1, binstring_guid/1]).
 -export([dirty_read_all/1, dirty_foreach_key/2, dirty_dump_log/1]).
 -export([append_file/2, ensure_parent_dirs_exist/1]).
+-export([format_stderr/2]).
 
 -import(mnesia).
 -import(lists).
@@ -99,6 +100,7 @@
 -spec(dirty_dump_log/1 :: (string()) -> 'ok' | {'error', any()}).
 -spec(append_file/2 :: (string(), string()) -> 'ok' | {'error', any()}).
 -spec(ensure_parent_dirs_exist/1 :: (string()) -> 'ok').
+-spec(format_stderr/2 :: (string(), [any()]) -> 'true').
 
 -endif.
 
@@ -377,3 +379,8 @@ ensure_parent_dirs_exist(Filename) ->
         {error, Reason} -> 
             throw({error, {cannot_create_parent_dirs, Filename, Reason}})
     end.
+
+format_stderr(Fmt, Args) ->
+    Port = open_port({fd, 0, 2}, [out]),
+    port_command(Port, io_lib:format(Fmt, Args)),
+    port_close(Port).
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 8d34d285..ca8b5878 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -30,6 +30,9 @@
 
 -export([table_names/0]).
 
+%% Called by rabbitmq-mnesia-current script
+-export([schema_current/0]).
+
 %% create_tables/0 exported for helping embed RabbitMQ in or alongside
 %% other mnesia-using Erlang applications, such as ejabberd
 -export([create_tables/0]).
@@ -48,6 +51,7 @@
 -spec(reset/0 :: () -> 'ok').
 -spec(force_reset/0 :: () -> 'ok').
 -spec(create_tables/0 :: () -> 'ok').
+-spec(schema_current/0 :: () -> bool()).
 
 -endif.
 
@@ -91,6 +95,20 @@ cluster(ClusterNodes) ->
 reset()       -> reset(false).
 force_reset() -> reset(true).
 
+%% This is invoked by rabbitmq-mnesia-current.
+schema_current() ->
+    application:start(mnesia),
+    ok = ensure_mnesia_running(),
+    ok = ensure_mnesia_dir(),
+    ok = init_db(read_cluster_nodes_config()),
+    try 
+        ensure_schema_integrity(),
+        true
+    catch
+        {error, {schema_integrity_check_failed, _Reason}} ->
+            false
+    end.
+
 %%--------------------------------------------------------------------
 
 table_definitions() ->
diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl
index c6a7e920..b99dfbc1 100644
--- a/src/rabbit_multi.erl
+++ b/src/rabbit_multi.erl
@@ -46,18 +46,22 @@ start() ->
                     io:format("done.~n"),
                     init:stop();
                 {'EXIT', {function_clause, [{?MODULE, action, _} | _]}} ->
-                    io:format("Invalid command ~p~n", [FullCommand]),
+                    error("invalid command '~s'",
+                          [lists:flatten(
+                             rabbit_misc:intersperse(" ", FullCommand))]),
                     usage();
                 timeout ->
-                    io:format("timeout starting some nodes.~n"),
+                    error("timeout starting some nodes.", []),
                     halt(1);
                 Other ->
-                    io:format("~nrabbit_multi action ~p failed:~n~p~n",
-                              [Command, Other]),
+                    error("~p", [Other]),
                     halt(2)
             end
     end.
 
+error(Format, Args) ->
+    rabbit_misc:format_stderr("Error: " ++ Format ++ "~n", Args).
+
 parse_args([Command | Args]) ->
     {list_to_atom(Command), Args}.
 
@@ -223,8 +227,7 @@ write_pids_file(Pids) ->
                  {ok, Device} ->
                      Device;
                  {error, Reason} ->
-                     throw({error, {cannot_create_pids_file,
-                                    FileName, Reason}})
+                     throw({cannot_create_pids_file, FileName, Reason})
              end,
     try
         ok = io:write(Handle, Pids),
@@ -233,8 +236,7 @@ write_pids_file(Pids) ->
         case file:close(Handle) of
             ok -> ok;
             {error, Reason1} ->
-                throw({error, {cannot_create_pids_file,
-                               FileName, Reason1}})
+                throw({cannot_create_pids_file, FileName, Reason1})
         end
     end,
     ok.
@@ -244,8 +246,7 @@ delete_pids_file() ->
     case file:delete(FileName) of
         ok              -> ok;
         {error, enoent} -> ok;
-        {error, Reason} -> throw({error, {cannot_delete_pids_file,
-                                          FileName, Reason}})
+        {error, Reason} -> throw({cannot_delete_pids_file, FileName, Reason})
     end.
 
 read_pids_file() ->
@@ -253,8 +254,7 @@ read_pids_file() ->
     case file:consult(FileName) of
         {ok, [Pids]}    -> Pids;
         {error, enoent} -> [];
-        {error, Reason} -> throw({error, {cannot_read_pids_file,
-                                          FileName, Reason}})
+        {error, Reason} -> throw({cannot_read_pids_file, FileName, Reason})
     end.
 
 kill_wait(Pid, TimeLeft, Forceful) when TimeLeft < 0 ->
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index a2337647..58eb5b54 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -36,6 +36,9 @@
 
 -define(SERVER, ?MODULE).
 
+%% cross-node routing optimisation is disabled because of bug 19758.
+-define(BUG19758, true).
+
 %%----------------------------------------------------------------------------
 
 -ifdef(use_specs).
@@ -51,6 +54,14 @@
 start_link() ->
     gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
 
+-ifdef(BUG19758).
+
+deliver(QPids, Mandatory, Immediate, Txn, Message) ->
+    check_delivery(Mandatory, Immediate,
+                   run_bindings(QPids, Mandatory, Immediate, Txn, Message)).
+
+-else.
+
 deliver(QPids, Mandatory, Immediate, Txn, Message) ->
     %% we reduce inter-node traffic by grouping the qpids by node and
     %% only delivering one copy of the message to each node involved,
@@ -114,6 +125,8 @@ deliver_per_node(NodeQPids, Mandatory, Immediate,
                     R),
     check_delivery(Mandatory, Immediate, {Routed, lists:append(Handled)}).
 
+-endif.
+
 %%--------------------------------------------------------------------
 
 init([]) ->
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 83e28c2f..d7c8bddf 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -131,6 +131,8 @@ test_topic_matching() ->
     passed.
 
 test_app_management() ->
+    true = rabbit_mnesia:schema_current(),
+
     %% starting, stopping, status
     ok = control_action(stop_app, []),
     ok = control_action(stop_app, []),