WIP

Author: dumbbell

deps/rabbit/src/rabbit_db_queue.erl

@@ -411,24 +411,28 @@ delete_in_khepri(QueueName) ->
     delete_in_khepri(QueueName, false).
 
 delete_in_khepri(QueueName, OnlyDurable) ->
+    Path = khepri_queue_path(QueueName),
     FeatureFlag = true,
     case FeatureFlag of
         true ->
-            Path = khepri_queue_path(QueueName),
-            {ok, Deleted} = khepri_adv:delete(Path),
-            Deletions = rabbit_db_binding:khepri_ret_to_deletions(
-                          Deleted, OnlyDurable),
-            Deletions;
+            case khepri_adv:delete(Path) of
+                {ok, #{Path := #{data := _}} = Deleted} ->
+                    %% we want to execute some things, as decided by
+                    %% rabbit_exchange, after the transaction.
+                    rabbit_db_binding:khepri_ret_to_deletions(
+                      Deleted, OnlyDurable);
+                {ok, _} ->
+                    ok
+            end;
         false ->
+            UsesUniformWriteRet = try
+                                      khepri_tx:does_api_comply_with(uniform_write_ret)
+                                  catch
+                                      error:undef ->
+                                          false
+                                  end,
             rabbit_khepri:transaction(
               fun () ->
-                      Path = khepri_queue_path(QueueName),
-                      UsesUniformWriteRet = try
-                                                khepri_tx:does_api_comply_with(uniform_write_ret)
-                                            catch
-                                                error:undef ->
-                                                    false
-                                            end,
                       Ret1 = khepri_tx_adv:delete(Path),
                       % logger:alert("Deleted queue ret = ~p", [Ret1]),
                       case Ret1 of