Fix for that bug. Basically, mnesia wasn't being deleted correctly, which meant on the subsequent startup, it would report messages which we couldn't find anywhere, as they'd been deleted from disk.

1 files changed, 23 insertions, 21 deletions

diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl
index 3527fd2aeb..e2da2ce10f 100644
--- a/src/rabbit_disk_queue.erl
+++ b/src/rabbit_disk_queue.erl
@@ -240,27 +240,29 @@ remove_messages(Q, MsgIds, MnesiaDelete, State = # dqstate { msg_location = MsgL
 	= lists:foldl(fun (MsgId, Files2) ->
 			      [{MsgId, RefCount, File, Offset, TotalSize}]
 				  = ets:lookup(MsgLocation, MsgId),
-			      if 1 =:= RefCount ->
-				      true = ets:delete(MsgLocation, MsgId),
-				      [{File, ValidTotalSize, ContiguousTop, Left, Right}]
-					  = ets:lookup(FileSummary, File),
-				      true = ets:delete(FileDetail, {File, Offset}),
-				      ContiguousTop1 = lists:min([ContiguousTop, Offset]),
-				      true = ets:insert(FileSummary,
-							{File, (ValidTotalSize - TotalSize - ?FILE_PACKING_ADJUSTMENT),
-							 ContiguousTop1, Left, Right}),
-				      if MnesiaDelete ->
-					      ok = mnesia:dirty_delete(rabbit_disk_queue, {MsgId, Q});
-					 true ->
-					      ok
-				      end,
-				      if CurName =:= File -> Files2;
-					 true -> sets:add_element(File, Files2)
-				      end;
-				 1 < RefCount ->
-				      ets:insert(MsgLocation, {MsgId, RefCount - 1, File, Offset, TotalSize}),
-				      Files2
-			      end
+			      Files3 =
+				  if 1 =:= RefCount ->
+					  true = ets:delete(MsgLocation, MsgId),
+					  [{File, ValidTotalSize, ContiguousTop, Left, Right}]
+					      = ets:lookup(FileSummary, File),
+					  true = ets:delete(FileDetail, {File, Offset}),
+					  ContiguousTop1 = lists:min([ContiguousTop, Offset]),
+					  true = ets:insert(FileSummary,
+							    {File, (ValidTotalSize - TotalSize - ?FILE_PACKING_ADJUSTMENT),
+							     ContiguousTop1, Left, Right}),
+					  if CurName =:= File -> Files2;
+					     true -> sets:add_element(File, Files2)
+					  end;
+				     1 < RefCount ->
+					  ets:insert(MsgLocation, {MsgId, RefCount - 1, File, Offset, TotalSize}),
+					  Files2
+				  end,
+			      if MnesiaDelete ->
+				      ok = mnesia:dirty_delete(rabbit_disk_queue, {MsgId, Q});
+				 true ->
+				      ok
+			      end,
+			      Files3
 		      end, sets:new(), MsgIds),
     State2 = compact(Files, State),
     {ok, State2}.