Prevent attach to volatile queue if FF disabled

Author: ansd

deps/rabbit/src/rabbit_amqp_session.erl

@@ -2754,12 +2754,14 @@ ensure_source(#'v1_0.source'{
                 } = Source0,
               SndSettled, LinkName, Vhost, User, ContainerId,
               ConnPid, PermCache0, TopicPermCache) ->
+    FFEnabled = rabbit_volatile_queue:ff_enabled(),
     case maps:from_keys(Caps, true) of
         #{{symbol, ?CAP_RABBITMQ_VOLATILE_QUEUE} := true}
-          when Durable =:= ?V_1_0_TERMINUS_DURABILITY_NONE andalso
+          when (Durable =:= undefined orelse Durable =:= ?V_1_0_TERMINUS_DURABILITY_NONE) andalso
                ExpiryPolicy =:= ?V_1_0_TERMINUS_EXPIRY_POLICY_LINK_DETACH andalso
                (Timeout =:= undefined orelse Timeout =:= {uint, 0}) andalso
-               SndSettled ->
+               SndSettled andalso
+               FFEnabled ->
             %% create volatile queue
             QNameBin = rabbit_volatile_queue:generate_name(self()),
             Source = #'v1_0.source'{
@@ -2798,7 +2800,7 @@ ensure_source(#'v1_0.source'{
             exit_not_implemented("Dynamic source not supported: ~tp", [Source0])
     end;
 ensure_source(Source = #'v1_0.source'{dynamic = true}, _, _, _, _, _, _, _, _) ->
-    exit_not_implemented("Dynamic source not supported: ~p", [Source]);
+    exit_not_implemented("Dynamic source not supported: ~tp", [Source]);
 ensure_source(Source0 = #'v1_0.source'{address = Address,
                                       durable = Durable},
               _SndSettle,  _LinkName, Vhost, User, _ContainerId,

deps/rabbit/src/rabbit_volatile_queue.erl

@@ -21,7 +21,8 @@
          key_from_name/1,
          pid_from_name/2,
          deliver_local/3,
-         exists/1]).
+         exists/1,
+         ff_enabled/0]).
 
 -export([declare/2,
          supports_stateful_delivery/0,

deps/rabbit/test/amqp_auth_SUITE.erl

@@ -482,6 +482,8 @@ attach_source_queue_dynamic_exclusive(Config) ->
     ok = close_connection_sync(Connection).
 
 attach_source_queue_dynamic_volatile(Config) ->
+    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.2.0'),
+
     OpnConf = connection_config(Config),
     {ok, Connection} = amqp10_client:open_connection(OpnConf),
     {ok, Session} = amqp10_client:begin_session_sync(Connection),

deps/rabbit/test/direct_reply_to_amqp_SUITE.erl

@@ -69,16 +69,11 @@ init_per_group(Group, Config) ->
                 Config1,
                 rabbit_ct_broker_helpers:setup_steps() ++
                 rabbit_ct_client_helpers:setup_steps()),
-    case Nodes of
-        1 ->
+    case rabbit_ct_broker_helpers:enable_feature_flag(Config2, 'rabbitmq_4.2.0') of
+        ok ->
             Config2;
-        _ ->
-            case rabbit_ct_broker_helpers:enable_feature_flag(Config2, 'rabbitmq_4.2.0') of
-                ok ->
-                    Config2;
-                {skip, _} = Skip ->
-                    Skip
-            end
+        {skip, _} = Skip ->
+            Skip
     end.
 
 end_per_group(_Group, Config) ->

deps/rabbit/test/direct_reply_to_amqpl_SUITE.erl

@@ -354,6 +354,8 @@ amqpl_amqp_amqpl(Config) ->
 %% Test that Direct Reply-To works when the requester is an AMQP 1.0 client
 %% and the responder is an AMQP 0.9.1 client.
 amqp_amqpl_amqp(Config) ->
+    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, 'rabbitmq_4.2.0'),
+
     RequestQ = atom_to_binary(?FUNCTION_NAME),
     AddrRequestQ = rabbitmq_amqp_address:queue(RequestQ),
     Id = <<"🥕"/utf8>>,