Merge pull request #15136 from rabbitmq/loic-cq-open-eventually-in-recovery

CQ: Use open_eventually in recovery

Author: michaelklishin

deps/rabbit/src/rabbit_classic_queue_index_v2.erl

@@ -262,7 +262,8 @@ recover_segments(State, _, StoreState, _, []) ->
 recover_segments(State0, ContainsCheckFun, StoreState0, CountersRef, [Segment|Tail]) ->
     SegmentEntryCount = segment_entry_count(),
     SegmentFile = segment_file(Segment, State0),
-    {ok, Fd} = file:open(SegmentFile, [read, read_ahead, write, raw, binary]),
+    {ok, Fd} = rabbit_file:open_eventually(SegmentFile,
+        [read, read_ahead, write, raw, binary]),
     case file:read(Fd, ?HEADER_SIZE) of
         {ok, <<?MAGIC:32,?VERSION:8,
                _FromSeqId:64/unsigned,_ToSeqId:64/unsigned,

deps/rabbit/src/rabbit_classic_queue_store_v2.erl

@@ -435,7 +435,7 @@ get_read_fd(Segment, State = #qs{ read_segment = Segment,
     {ok, Fd, State};
 get_read_fd(Segment, State = #qs{ read_fd = OldFd }) ->
     maybe_close_fd(OldFd),
-    case file:open(segment_file(Segment, State), [read, raw, binary]) of
+    case rabbit_file:open_eventually(segment_file(Segment, State), [read, raw, binary]) of
         {ok, Fd} ->
             case file:read(Fd, ?HEADER_SIZE) of
                 {ok, <<?MAGIC:32,?VERSION:8,

deps/rabbit/src/rabbit_file.erl

@@ -368,5 +368,8 @@ open_eventually(File, Modes, N) ->
         %% try again up to 3 times.
         {error, eacces} ->
             timer:sleep(10),
-            open_eventually(File, Modes, N - 1)
+            open_eventually(File, Modes, N - 1);
+        %% Other errors we return immediately.
+        Error ->
+            Error
     end.