Terminate when message stores fail to start

This makes rabbit.vhost_restart_strategy work as expected:
higher up supervisors should decide whether the node should
stop or keep going.

Per discussion with @hairyhum.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 7c631ddc66..4dfa6b69ac 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -504,12 +504,14 @@ safely_start_msg_store(VHost, Type, Refs, StartFunState) ->
     case rabbit_vhost_msg_store:start(VHost, Type, Refs, StartFunState) of
         {ok, _} ->
             rabbit_log:info("Started message store of type ~s for vhost '~s'~n", [abbreviated_type(Type), VHost]);
-        {error, {no_such_vhost, VHost}} ->
+        {error, {no_such_vhost, VHost}} = Err ->
             rabbit_log:error("Failed to start message store of type ~s for vhost '~s': the vhost no longer exists!~n",
-                             [Type, VHost]);
+                             [Type, VHost]),
+            exit(Err);
         {error, Error} ->
             rabbit_log:error("Failed to start message store of type ~s for vhost '~s': ~p~n",
-                             [Type, VHost, Error])
+                             [Type, VHost, Error]),
+            exit({error, Error})
     end.
 
 abbreviated_type(?TRANSIENT_MSG_STORE)  -> transient;