confirm messages when they get written do disk in *any* queue; confirm messages immediately if they've already been written to disk

1 files changed, 7 insertions, 2 deletions

diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 1a25e7900c..0dba4dd27d 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -683,13 +683,18 @@ handle_cast({write, CRef, Guid},
                                     sum_valid_data = SumValid + TotalSize,
                                     sum_file_size  = SumFileSize + TotalSize,
                                     cref_to_guids  = CTG1 }));
-        #msg_location { ref_count = RefCount } ->
+        #msg_location { ref_count = RefCount, file = File } ->
             %% We already know about it, just update counter. Only
             %% update field otherwise bad interaction with concurrent GC
             ok = index_update_fields(Guid,
                                      {#msg_location.ref_count, RefCount + 1},
                                      State),
-            noreply(State)
+            CTG1 = case {dict:find(CRef, CODC), File =:= CurFile} of
+                       {{ok, _}  , true}  -> rabbit_misc:dict_cons(CRef, Guid, CTG);
+                       {{ok, Fun}, false} -> Fun([Guid]), CTG;
+                       _                  -> CTG
+                   end,
+            noreply(State #msstate { cref_to_guids = CTG1 })
     end;
 
 handle_cast({remove, Guids}, State) ->