DQT: fall back to node-wide default

Partial Backport of rabbitmq#12109
Bump

Author: SimonUnge

deps/rabbit/src/rabbit_amqqueue.erl

@@ -778,31 +778,38 @@ augment_declare_args(VHost, Durable, Exclusive, AutoDelete, Args0) ->
         #{default_queue_type := DefaultQueueType}
           when is_binary(DefaultQueueType) andalso
                not HasQTypeArg ->
-            Type = rabbit_queue_type:discover(DefaultQueueType),
-            IsPermitted = is_queue_args_combination_permitted(
-                            Durable, Exclusive),
-            IsCompatible = rabbit_queue_type:is_compatible(
-                             Type, Durable, Exclusive, AutoDelete),
-            case IsPermitted andalso IsCompatible of
-                true ->
-                    %% patch up declare arguments with x-queue-type if there
-                    %% is a vhost default set the queue is durable and not exclusive
-                    %% and there is no queue type argument
-                    %% present
-                    rabbit_misc:set_table_value(Args0,
-                                                <<"x-queue-type">>,
-                                                longstr,
-                                                DefaultQueueType);
-                false ->
-                    %% if the properties are incompatible with the declared
-                    %% DQT, use the fall back type
-                    rabbit_misc:set_table_value(Args0,
-                                                <<"x-queue-type">>,
-                                                longstr,
-                                                rabbit_queue_type:short_alias_of(rabbit_queue_type:fallback()))
-            end;
+            update_args_table_with_queue_type(DefaultQueueType, Durable, Exclusive, AutoDelete, Args0);
         _ ->
-            Args0
+            case HasQTypeArg of
+                true -> Args0;
+                false ->
+                    update_args_table_with_queue_type(rabbit_queue_type:short_alias_of(rabbit_queue_type:default()), Durable, Exclusive, AutoDelete, Args0)
+            end
+    end.
+
+update_args_table_with_queue_type(DefaultQueueType, Durable, Exclusive, AutoDelete, Args) ->
+    Type = rabbit_queue_type:discover(DefaultQueueType),
+    IsPermitted = is_queue_args_combination_permitted(
+        Durable, Exclusive),
+    IsCompatible = rabbit_queue_type:is_compatible(
+        Type, Durable, Exclusive, AutoDelete),
+    case IsPermitted andalso IsCompatible of
+        true ->
+            %% patch up declare arguments with x-queue-type if there
+            %% is a vhost default set the queue is durable and not exclusive
+            %% and there is no queue type argument
+            %% present
+            rabbit_misc:set_table_value(Args,
+                <<"x-queue-type">>,
+                longstr,
+                DefaultQueueType);
+        false ->
+            %% if the properties are incompatible with the declared
+            %% DQT, use the fall back type
+            rabbit_misc:set_table_value(Args,
+                <<"x-queue-type">>,
+                longstr,
+                rabbit_queue_type:short_alias_of(rabbit_queue_type:fallback()))
     end.
 
 -spec check_exclusive_access(amqqueue:amqqueue(), pid()) ->

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -143,6 +143,7 @@ all_tests() ->
      idempotent_recover,
      vhost_with_quorum_queue_is_deleted,
      vhost_with_default_queue_type_declares_quorum_queue,
+     node_wide_default_queue_type_declares_quorum_queue,
      delete_immediately_by_resource,
      consume_redelivery_count,
      subscribe_redelivery_count,
@@ -597,7 +598,7 @@ start_queue_concurrent(Config) ->
 quorum_cluster_size_3(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "quorum_cluster_size_3 tests isn't mixed version reliable"};
+            {skip, "quorum_cluster_size_3 test isn't mixed version reliable"};
         false ->
             quorum_cluster_size_x(Config, 3, 3)
     end.
@@ -822,6 +823,40 @@ vhost_with_default_queue_type_declares_quorum_queue(Config) ->
     amqp_connection:close(Conn),
     ok.
 
+node_wide_default_queue_type_declares_quorum_queue(Config) ->
+    case rabbit_ct_helpers:is_mixed_versions() of
+    true ->
+        {skip, "node_wide_default_queue_type_declares_quorum_queue test isn't mixed version compatible"};
+    false ->
+        node_wide_default_queue_type_declares_quorum_queue0(Config)
+    end.
+
+node_wide_default_queue_type_declares_quorum_queue0(Config) ->
+    Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
+    rpc:call(Node, application, set_env, [rabbit, default_queue_type, rabbit_quorum_queue]),
+    VHost = atom_to_binary(?FUNCTION_NAME, utf8),
+    QName = atom_to_binary(?FUNCTION_NAME, utf8),
+    User = ?config(rmq_username, Config),
+
+    AddVhostArgs = [VHost, #{}, User],
+    ok = rabbit_ct_broker_helpers:rpc(Config, Node, rabbit_vhost, add,
+        AddVhostArgs),
+    ok = rabbit_ct_broker_helpers:set_full_permissions(Config, User, VHost),
+    Conn = rabbit_ct_client_helpers:open_unmanaged_connection(Config, Node, VHost),
+    {ok, Ch} = amqp_connection:open_channel(Conn),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare(Ch, QName, [])),
+    assert_queue_type(Node, VHost, QName, rabbit_quorum_queue),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare(Ch, QName, [])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0},
+        declare(Ch, QName, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0}, declare_passive(Ch, QName, [])),
+    ?assertEqual({'queue.declare_ok', QName, 0, 0},
+        declare_passive(Ch, QName, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
+    amqp_connection:close(Conn),
+
+    rpc:call(Node, application, set_env, [rabbit, default_queue_type, rabbit_classic_queue]),
+    ok.
+
 restart_all_types(Config) ->
     %% Test the node restart with both types of queues (quorum and classic) to
     %% ensure there are no regressions
@@ -1049,7 +1084,7 @@ shrink_all(Config) ->
 rebalance(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "rebalance tests isn't mixed version compatible"};
+            {skip, "rebalance test isn't mixed version compatible"};
         false ->
             rebalance0(Config)
     end.
@@ -1512,7 +1547,7 @@ leadership_takeover(Config) ->
 metrics_cleanup_on_leadership_takeover(Config) ->
     case rabbit_ct_helpers:is_mixed_versions() of
         true ->
-            {skip, "metrics_cleanup_on_leadership_takeover tests isn't mixed version compatible"};
+            {skip, "metrics_cleanup_on_leadership_takeover test isn't mixed version compatible"};
         false ->
             metrics_cleanup_on_leadership_takeover0(Config)
     end.