delete_exclusive -> delete_immediately

3 files changed, 9 insertions, 13 deletions

diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index 30d80da047..cce3c18a0f 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -31,7 +31,7 @@
 
 -module(rabbit_amqqueue).
 
--export([start/0, stop/0, declare/5, delete_exclusive/1, delete/3, purge/1]).
+-export([start/0, stop/0, declare/5, delete_immediately/1, delete/3, purge/1]).
 -export([internal_declare/2, internal_delete/1,
          maybe_run_queue_via_backing_queue/2,
          update_ram_duration/1, set_ram_duration_target/2,
@@ -115,8 +115,8 @@
         (rabbit_types:amqqueue())
         -> {'ok', non_neg_integer(), non_neg_integer()}).
 -spec(emit_stats/1 :: (rabbit_types:amqqueue()) -> 'ok').
--spec(delete_exclusive/1 :: (rabbit_types:amqqueue())
-                            -> rabbit_types:ok_or_error2(qlen(),
+-spec(delete_immediately/1 :: (rabbit_types:amqqueue())
+                              -> rabbit_types:ok_or_error2(qlen(),
                                                          'not_exclusive')).
 -spec(delete/3 ::
       (rabbit_types:amqqueue(), 'false', 'false')
@@ -362,8 +362,8 @@ stat(#amqqueue{pid = QPid}) -> delegate_call(QPid, stat, infinity).
 emit_stats(#amqqueue{pid = QPid}) ->
     delegate_cast(QPid, emit_stats).
 
-delete_exclusive(#amqqueue{ pid = QPid }) ->
-    gen_server2:cast(QPid, delete_exclusive).
+delete_immediately(#amqqueue{ pid = QPid }) ->
+    gen_server2:cast(QPid, delete_immediately).
 
 delete(#amqqueue{ pid = QPid }, IfUnused, IfEmpty) ->
     delegate_call(QPid, {delete, IfUnused, IfEmpty}, infinity).
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 40605d4202..dc5b0fd12a 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -601,7 +601,7 @@ prioritise_call(Msg, _From, _State) ->
 prioritise_cast(Msg, _State) ->
     case Msg of
         update_ram_duration                  -> 8;
-        delete_exclusive                     -> 8;
+        delete_immediately                   -> 8;
         {set_ram_duration_target, _Duration} -> 8;
         {set_maximum_since_use, _Age}        -> 8;
         maybe_expire                         -> 8;
@@ -787,9 +787,6 @@ handle_call(stat, _From, State = #q{backing_queue = BQ,
     reply({ok, BQ:len(BQS), queue:len(ActiveConsumers)},
           ensure_expiry_timer(State));
 
-handle_call(delete_exclusive, _From, State) ->
-    reply({error, not_exclusive}, State);
-
 handle_call({delete, IfUnused, IfEmpty}, _From,
             State = #q{backing_queue_state = BQS, backing_queue = BQ}) ->
     IsEmpty = BQ:is_empty(BQS),
@@ -861,9 +858,8 @@ handle_cast({reject, AckTags, Requeue, ChPid},
 handle_cast({rollback, Txn, ChPid}, State) ->
     noreply(rollback_transaction(Txn, ChPid, State));
 
-handle_cast(delete_exclusive,
-            State = #q{ q = #amqqueue{exclusive_owner = Owner}})
-  when Owner =/= none ->
+handle_cast(delete_immediately,
+            State = #q{ q = #amqqueue{exclusive_owner = Owner}}) ->
     {stop, normal, State};
 
 handle_cast({unblock, ChPid}, State) ->
diff --git a/src/rabbit_queue_collector.erl b/src/rabbit_queue_collector.erl
index f980844267..9d8757a770 100644
--- a/src/rabbit_queue_collector.erl
+++ b/src/rabbit_queue_collector.erl
@@ -80,7 +80,7 @@ handle_call(delete_all, _From, State = #state{queues = Queues}) ->
     Qs = dict:to_list(Queues),
     [rabbit_misc:with_exit_handler(
        fun () -> ok end,
-       fun () -> rabbit_amqqueue:delete_exclusive(Q) end)
+       fun () -> rabbit_amqqueue:delete_immediately(Q) end)
      || {_MRef, Q} <- Qs],
     {reply, ok, wait_DOWNs(gb_sets:from_list([MRef || {MRef, _Q} <- Qs]),
                            State)}.