diff options
| -rw-r--r-- | src/rabbit_msg_store_gc.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl index 3d0e983fd3..76b6422a98 100644 --- a/src/rabbit_msg_store_gc.erl +++ b/src/rabbit_msg_store_gc.erl @@ -135,9 +135,8 @@ attempt_action(Action, Files, State = #state { parent = Parent, pending_no_readers = Pending, msg_store_state = MsgStoreState }) -> - case lists:filter(fun (File) -> - rabbit_msg_store:has_readers(File, MsgStoreState) - end, Files) of + case [File || File <- Files, + rabbit_msg_store:has_readers(File, MsgStoreState)] of [] -> do_action(Action, Files, Parent, MsgStoreState), State; [File | _] -> Pending1 = dict:store(File, {Action, Files}, Pending), diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 1b47cdb71c..2c13c736b9 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1564,7 +1564,7 @@ test_msg_store() -> %% push a lot of msgs in... at least 100 files worth {ok, FileSize} = application:get_env(rabbit, msg_store_file_size_limit), PayloadSizeBits = 65536, - BigCount = trunc(100 * FileSize / (PayloadSizeBits div 8)), + BigCount = trunc(10 * FileSize / (PayloadSizeBits div 8)), GuidsBig = [guid_bin(X) || X <- lists:seq(1, BigCount)], Payload = << 0:PayloadSizeBits >>, ok = foreach_with_msg_store_client( |