cluster wide queue limit

Author: SimonUnge

deps/rabbit/src/rabbit_amqqueue.erl

@@ -223,6 +223,7 @@ declare(QueueName, Durable, AutoDelete, Args, Owner, ActingUser) ->
 declare(QueueName = #resource{virtual_host = VHost}, Durable, AutoDelete, Args,
         Owner, ActingUser, Node) ->
     ok = check_declare_arguments(QueueName, Args),
+    ok = check_cluster_queue_limit(QueueName),
     Type = get_queue_type(Args),
     case rabbit_queue_type:is_enabled(Type) of
         true ->
@@ -1122,6 +1123,21 @@ check_queue_type(Val, _Args) when is_binary(Val) ->
 check_queue_type(_Val, _Args) ->
     {error, invalid_queue_type}.
 
+check_cluster_queue_limit(#resource{name = QueueName}) ->
+    case rabbit_misc:get_env(rabbit, cluster_queue_limit, infinity) of
+        infinity ->
+            false;
+        Limit ->
+            case rabbit_db_queue:count() >= Limit of
+                true ->
+                    rabbit_misc:precondition_failed("cannot declare queue '~ts': "
+                                                    "queue limit in cluster (~tp) is reached",
+                                                    [QueueName, Limit]);
+                false ->
+                    ok
+            end
+    end.
+
 -spec list() -> [amqqueue:amqqueue()].
 
 list() ->

deps/rabbit/src/rabbit_channel.erl

@@ -1065,21 +1065,6 @@ check_vhost_queue_limit(#resource{name = QueueName}, VHost) ->
 
   end.
 
-check_cluster_queue_limit(#resource{name = QueueName}) ->
-    case rabbit_misc:get_env(rabbit, cluster_queue_limit, infinity) of
-        infinity ->
-            false;
-        Limit ->
-            case rabbit_db_queue:count() >= Limit of
-                true ->
-                    rabbit_misc:precondition_failed("cannot declare queue '~ts': "
-                                                    "queue limit in cluster (~tp) is reached",
-                                                    [QueueName, Limit]);
-                false ->
-                    ok
-            end
-    end.
-
 qbin_to_resource(QueueNameBin, VHostPath) ->
     name_to_resource(queue, QueueNameBin, VHostPath).
 
@@ -2541,7 +2526,6 @@ handle_method(#'queue.declare'{queue       = QueueNameBin,
         {error, not_found} ->
             %% enforce the limit for newly declared queues only
             check_vhost_queue_limit(QueueName, VHostPath),
-            check_cluster_queue_limit(QueueName),
             DlxKey = <<"x-dead-letter-exchange">>,
             case rabbit_misc:r_arg(VHostPath, exchange, Args, DlxKey) of
                undefined ->