Requeue turns out to be vastly more elegant and predictable than in mq.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index a9a43fd898..0b4a7689a8 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -33,7 +33,7 @@
 
 -export([init/1, publish/3, set_queue_ram_duration_target/2,
          remeasure_egress_rate/1, fetch/1, ack/2, len/1, is_empty/1,
-         maybe_start_prefetcher/1, purge/1, delete/1]).
+         maybe_start_prefetcher/1, purge/1, delete/1, requeue/2]).
 
 %%----------------------------------------------------------------------------
 
@@ -287,6 +287,16 @@ delete(State) ->
              State1 #vqstate { index_state = IndexState1 }}
     end.
 
+%% [{Msg, AckTag}]
+requeue(MsgsWithAckTags, State) ->
+    {AckTags, State1} =
+        lists:foldl(
+          fun ({Msg, AckTag}, {AckTagsAcc, StateN}) ->
+                  StateN1 = publish(Msg, true, StateN),
+                  {[AckTag | AckTagsAcc], StateN1}
+          end, {[], State}, MsgsWithAckTags),
+    ack(AckTags, State1).
+
 %%----------------------------------------------------------------------------
 
 delete1(NextSeqId, Count, GammaSeqId, IndexState)