Extend #15276

Author: michaelklishin

deps/rabbit/src/rabbit_db_queue.erl

@@ -399,23 +399,28 @@ delete(QueueName, Reason) ->
 
 delete_if(QueueName, Conditions, Reason) ->
     rabbit_khepri:handle_fallback(
-      #{mnesia => fun() -> delete_in_mnesia(QueueName, Reason) end,
+      #{mnesia => fun() -> delete_in_mnesia(QueueName, Conditions, Reason) end,
         khepri => fun() -> delete_in_khepri(QueueName, Conditions) end
        }).
 
-delete_in_mnesia(QueueName, Reason) ->
+delete_in_mnesia(QueueName, Conditions, Reason) ->
     rabbit_mnesia:execute_mnesia_transaction(
       fun () ->
               case {mnesia:wread({?MNESIA_TABLE, QueueName}),
                     mnesia:wread({?MNESIA_DURABLE_TABLE, QueueName})} of
                   {[], []} ->
                       ok;
-                  _ ->
-                      OnlyDurable = case Reason of
-                                        missing_owner -> true;
-                                        _ -> false
-                                    end,
-                      internal_delete_in_mnesia(QueueName, OnlyDurable, Reason)
+                  {Qs, DurableQs} ->
+                      case queue_matches_conditions(Qs ++ DurableQs, Conditions) of
+                          true ->
+                              OnlyDurable = case Reason of
+                                                missing_owner -> true;
+                                                _ -> false
+                                            end,
+                              internal_delete_in_mnesia(QueueName, OnlyDurable, Reason);
+                          false ->
+                              ok
+                      end
               end
       end).
 
@@ -1457,6 +1462,21 @@ clear_in_khepri() ->
 %% Internal
 %% --------------------------------------------------------------
 
+queue_matches_conditions(_, []) ->
+    true;
+queue_matches_conditions([], _Conditions) ->
+    false;
+queue_matches_conditions([Q | _], [#if_data_matches{pattern = Pattern,
+                                                     conditions = Conditions} | Rest]) ->
+    MatchSpec = ets:match_spec_compile([{Pattern, Conditions, [match]}]),
+    case ets:match_spec_run([Q], MatchSpec) of
+        [match] -> queue_matches_conditions([Q], Rest);
+        [] -> false
+    end;
+queue_matches_conditions(_, [Condition | _]) ->
+    %% Unknown condition type - don't delete to be safe
+    error({unsupported_condition_for_mnesia, Condition}).
+
 list_with_possible_retry_in_mnesia(Fun) ->
     %% amqqueue migration:
     %% The `rabbit_queue' or `rabbit_durable_queue' tables

deps/rabbit/test/rabbit_db_queue_SUITE.erl

@@ -64,7 +64,8 @@ mnesia_tests() ->
      foreach_transient,
      delete_transient,
      update_in_mnesia_tx,
-     get_durable_in_mnesia_tx
+     get_durable_in_mnesia_tx,
+     delete_exclusive_queue
     ].
 
 %% -------------------------------------------------------------------
@@ -330,13 +331,8 @@ delete1(_Config) ->
     passed.
 
 delete_exclusive_queue(Config) ->
-    case rabbit_ct_broker_helpers:configured_metadata_store(Config) of
-        mnesia ->
-            {skip, "this validates a bugfix only implemented for Khperi"};
-        _ ->
-            passed = rabbit_ct_broker_helpers:rpc(
-                       Config, 0, ?MODULE, delete_exclusive_queue1, [Config])
-    end.
+    passed = rabbit_ct_broker_helpers:rpc(
+               Config, 0, ?MODULE, delete_exclusive_queue1, [Config]).
 
 delete_exclusive_queue1(_Config) ->
     QName = rabbit_misc:r(?VHOST, queue, <<"test-exclusive-queue">>),