Move code to declare to be called by all queue types.

Author: SimonUnge

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 ->

deps/rabbit/src/rabbit_queue_type.erl

@@ -281,6 +281,7 @@ is_compatible(Type, Durable, Exclusive, AutoDelete) ->
     {'error', Err :: term() }.
 declare(Q0, Node) ->
     Q = rabbit_queue_decorator:set(rabbit_policy:set(Q0)),
+    ok = check_cluster_queue_limit(Q),
     Mod = amqqueue:get_type(Q),
     Mod:declare(Q, Node).
 
@@ -730,3 +731,19 @@ known_queue_type_names() ->
     {QueueTypes, _} = lists:unzip(Registered),
     QTypeBins = lists:map(fun(X) -> atom_to_binary(X) end, QueueTypes),
     ?KNOWN_QUEUE_TYPES ++ QTypeBins.
+
+check_cluster_queue_limit(Q) ->
+    #resource{name = QueueName} = amqqueue:get_name(Q),
+    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.