Remove x-queue-mode and restrict x-queue-version to 2

Author: lhoguin

deps/rabbit/src/rabbit_amqqueue.erl

@@ -951,7 +951,6 @@ declare_args() ->
      {<<"x-max-in-memory-bytes">>, fun check_non_neg_int_arg/2},
      {<<"x-max-priority">>, fun check_max_priority_arg/2},
      {<<"x-overflow">>, fun check_overflow/2},
-     {<<"x-queue-mode">>, fun check_queue_mode/2},
      {<<"x-queue-version">>, fun check_queue_version/2},
      {<<"x-single-active-consumer">>, fun check_single_active_consumer_arg/2},
      {<<"x-queue-type">>, fun check_queue_type/2},
@@ -1168,32 +1167,14 @@ check_stream_offset_arg(Val, _Args) ->
             {error, {invalid_stream_offset_arg, Val}}
     end.
 
--define(KNOWN_QUEUE_MODES, [<<"default">>, <<"lazy">>]).
-check_queue_mode({longstr, Val}, _Args) ->
-    case lists:member(Val, ?KNOWN_QUEUE_MODES) of
-        true  -> ok;
-        false -> {error, rabbit_misc:format("unsupported queue mode '~ts'", [Val])}
-    end;
-check_queue_mode({Type,    _}, _Args) ->
-    {error, {unacceptable_type, Type}};
-check_queue_mode(Val, _Args) when is_binary(Val) ->
-    case lists:member(Val, ?KNOWN_QUEUE_MODES) of
-        true  -> ok;
-        false -> {error, rabbit_misc:format("unsupported queue mode '~ts'", [Val])}
-    end;
-check_queue_mode(_Val, _Args) ->
-    {error, invalid_queue_mode}.
-
 check_queue_version({Type, Val}, Args) ->
     case check_non_neg_int_arg({Type, Val}, Args) of
-        ok when Val == 1 -> ok;
         ok when Val == 2 -> ok;
         ok               -> {error, rabbit_misc:format("unsupported queue version '~b'", [Val])};
         Error            -> Error
     end;
 check_queue_version(Val, Args) ->
     case check_non_neg_int_arg(Val, Args) of
-        ok when Val == 1 -> ok;
         ok when Val == 2 -> ok;
         ok               -> {error, rabbit_misc:format("unsupported queue version '~b'", [Val])};
         Error            -> Error

deps/rabbit/test/policy_SUITE.erl

@@ -222,25 +222,21 @@ queue_type_specific_policies(Config) ->
     rabbit_ct_client_helpers:close_connection(Conn),
     passed.
 
+%% If we ever introduce a new version after 2, note that a previous
+%% version of this test would check policy precedence between versions
+%% 1 and 2 in the past, and could easily be restored to handle future cases.
 classic_queue_version_policies(Config) ->
     [Server | _] = rabbit_ct_broker_helpers:get_node_configs(Config, nodename),
     {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0),
     QName = <<"policy_queue_version">>,
     declare(Ch, QName),
-    QueueVersionOnePolicy = [{<<"queue-version">>, 1}],
-    QueueVersionTwoPolicy = [{<<"queue-version">>, 2}],
-
-    Opts = #{config => Config,
-             server => Server,
-             qname  => QName},
-
-    %% Queue version OperPolicy has precedence always
-    verify_policies(QueueVersionOnePolicy, QueueVersionTwoPolicy, QueueVersionTwoPolicy, Opts),
-    verify_policies(QueueVersionTwoPolicy, QueueVersionOnePolicy, QueueVersionOnePolicy, Opts),
-
+    Policy = [{<<"queue-version">>, 2}],
+    rabbit_ct_broker_helpers:set_policy(Config, 0, <<"policy">>,
+                                        QName, <<"queues">>,
+                                        Policy),
+    ?assertMatch(2, check_policy_value(Server, QName, <<"queue-version">>)),
     delete(Ch, QName),
     rabbit_ct_broker_helpers:clear_policy(Config, 0, <<"policy">>),
-    rabbit_ct_broker_helpers:clear_operator_policy(Config, 0, <<"op_policy">>),
     rabbit_ct_client_helpers:close_channel(Ch),
     rabbit_ct_client_helpers:close_connection(Conn),
     passed.

deps/rabbit/test/priority_queue_SUITE.erl

@@ -391,23 +391,16 @@ info_head_message_timestamp1(_Config) ->
     PQ:delete_and_terminate(a_whim, BQS6),
     passed.
 
-%% Because queue version is now ignored, this test is expected
-%% to always get a queue version 2.
+%% Only queue version 2 can be declared.
 info_backing_queue_version(Config) ->
     {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0),
-    Q1 = <<"info-priority-queue-v1">>,
     Q2 = <<"info-priority-queue-v2">>,
-    declare(Ch, Q1, [{<<"x-max-priority">>, byte, 3},
-                    {<<"x-queue-version">>, byte, 1}]),
     declare(Ch, Q2, [{<<"x-max-priority">>, byte, 3},
                     {<<"x-queue-version">>, byte, 2}]),
     try
-        {ok, [{backing_queue_status, BQS1}]} = info(Config, Q1, [backing_queue_status]),
-        2 = proplists:get_value(version, BQS1),
         {ok, [{backing_queue_status, BQS2}]} = info(Config, Q2, [backing_queue_status]),
         2 = proplists:get_value(version, BQS2)
     after
-        delete(Ch, Q1),
         delete(Ch, Q2),
         rabbit_ct_client_helpers:close_channel(Ch),
         rabbit_ct_client_helpers:close_connection(Conn),