Merge pull request #12281 from rabbitmq/mergify/bp/v4.0.x/pr-12279

Author: the-mikedavis

deps/rabbit/src/rabbit_amqqueue.erl

@@ -1687,7 +1687,10 @@ delete_crashed(Q) when ?amqqueue_is_classic(Q) ->
 delete_crashed(Q, ActingUser) when ?amqqueue_is_classic(Q) ->
     rabbit_classic_queue:delete_crashed(Q, ActingUser).
 
--spec delete_crashed_internal(amqqueue:amqqueue(), rabbit_types:username()) -> 'ok'.
+-spec delete_crashed_internal(Q, ActingUser) -> Ret when
+      Q :: amqqueue:amqqueue(),
+      ActingUser :: rabbit_types:username(),
+      Ret :: ok | {error, timeout}.
 delete_crashed_internal(Q, ActingUser) when ?amqqueue_is_classic(Q) ->
     rabbit_classic_queue:delete_crashed_internal(Q, ActingUser).
 

deps/rabbit/src/rabbit_classic_queue.erl

@@ -168,8 +168,15 @@ delete(Q0, IfUnused, IfEmpty, ActingUser) when ?amqqueue_is_classic(Q0) ->
                             rabbit_log:warning("Queue ~ts in vhost ~ts is down. "
                                                "Forcing queue deletion.",
                                                [Name, Vhost]),
-                            delete_crashed_internal(Q, ActingUser),
-                            {ok, 0}
+                            case delete_crashed_internal(Q, ActingUser) of
+                                ok ->
+                                    {ok, 0};
+                                {error, timeout} ->
+                                    {error, protocol_error,
+                                     "The operation to delete ~ts from the "
+                                     "metadata store timed out",
+                                     [rabbit_misc:rs(QName)]}
+                            end
                     end
             end;
         {error, not_found} ->
@@ -551,7 +558,7 @@ delete_crashed(Q, ActingUser) ->
 
 delete_crashed_internal(Q, ActingUser) ->
     delete_crashed_in_backing_queue(Q),
-    ok = rabbit_amqqueue:internal_delete(Q, ActingUser).
+    rabbit_amqqueue:internal_delete(Q, ActingUser).
 
 delete_crashed_in_backing_queue(Q) ->
     {ok, BQ} = application:get_env(rabbit, backing_queue_module),

deps/rabbit/src/rabbit_quorum_queue.erl

@@ -825,8 +825,8 @@ delete(Q, _IfUnused, _IfEmpty, ActingUser) when ?amqqueue_is_quorum(Q) ->
                     {ok, ReadyMsgs};
                 {error, timeout} ->
                     {protocol_error, internal_error,
-                     "The operation to delete queue ~ts from the metadata "
-                     "store timed out", [rabbit_misc:rs(QName)]}
+                     "The operation to delete ~ts from the metadata store "
+                     "timed out", [rabbit_misc:rs(QName)]}
             end;
         {error, {no_more_servers_to_try, Errs}} ->
             case lists:all(fun({{error, noproc}, _}) -> true;

deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl

@@ -113,8 +113,14 @@ declare(Q0, _Node) ->
 delete(Q, _IfUnused, _IfEmpty, ActingUser) ->
     QName = amqqueue:get_name(Q),
     log_delete(QName, amqqueue:get_exclusive_owner(Q)),
-    ok = rabbit_amqqueue:internal_delete(Q, ActingUser),
-    {ok, 0}.
+    case rabbit_amqqueue:internal_delete(Q, ActingUser) of
+        ok ->
+            {ok, 0};
+        {error, timeout} ->
+            {protocol_error, internal_error,
+             "The operation to delete ~ts from the metadata store timed "
+             "out", [rabbit_misc:rs(QName)]}
+    end.
 
 -spec deliver([{amqqueue:amqqueue(), stateless}],
               Msg :: mc:state(),