Yet another API consistency design win for the Erlang OTP team. ets:update_counter throws badarg if the key doesn't exist. ets:update_element returns false if the key doesn't exist. The bizarre error that I've been tracking down for a week, and have still not replicated (but was a badmatch false (which means it's likely that it should have been true)) is almost certainly this.

1 files changed, 4 insertions, 10 deletions

diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 2db3c34e9b..6be4358cf8 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1216,16 +1216,10 @@ maybe_compact(State) ->
     State.
 
 mark_handle_to_close(File) ->
-    lists:foldl(
-      fun ({Key, open}, true) ->
-              try
-                  true = ets:update_element(?FILE_HANDLES_ETS_NAME,
-                                            Key, {2, close})
-              catch error:badarg -> %% client has deleted concurrently, no prob
-                      true
-              end
-      end,
-      true, ets:match_object(?FILE_HANDLES_ETS_NAME, {{'_', File}, open})).
+    [ ets:update_element(?FILE_HANDLES_ETS_NAME, Key, {2, close})
+      || {Key, open} <- ets:match_object(?FILE_HANDLES_ETS_NAME,
+                                         {{'_', File}, open}) ],
+    true.
 
 find_files_to_gc(_N, '$end_of_table') ->
     undefined;