Close fd open in msg store client before hibernating

Author: Loïc Hoguin

deps/rabbit/src/rabbit_msg_store.erl

@@ -11,7 +11,7 @@
 
 -export([start_link/5, successfully_recovered_state/1,
          client_init/3, client_terminate/1, client_delete_and_terminate/1,
-         client_ref/1,
+         client_pre_hibernate/1, client_ref/1,
          write/4, write_flow/4, read/2, read_many/2, contains/2, remove/2]).
 
 -export([set_maximum_since_use/2,
@@ -459,6 +459,12 @@ client_delete_and_terminate(CState = #client_msstate { client_ref = Ref }) ->
     ok = server_cast(CState, {client_delete, Ref}),
     client_maybe_close_current_file(CState).
 
+-spec client_pre_hibernate(client_msstate()) -> client_msstate().
+
+client_pre_hibernate(CState) ->
+    client_maybe_close_current_file(CState),
+    CState#client_msstate{ current_file = undefined }.
+
 client_maybe_close_current_file(#client_msstate{ current_file = CurrentFile }) ->
     case CurrentFile of
         undefined -> ok;

deps/rabbit/src/rabbit_variable_queue.erl

@@ -804,12 +804,15 @@ timeout(State = #vqstate { index_mod   = IndexMod,
 handle_pre_hibernate(State = #vqstate { index_mod   = IndexMod,
                                         index_state = IndexState0,
                                         store_state = StoreState0,
+                                        msg_store_clients = MSCState0,
                                         unconfirmed_simple = UCS,
                                         confirmed   = C }) ->
+    MSCState = msg_store_pre_hibernate(MSCState0),
     IndexState = IndexMod:flush(IndexState0),
     StoreState = rabbit_classic_queue_store_v2:sync(StoreState0),
     State #vqstate { index_state = IndexState,
                      store_state = StoreState,
+                     msg_store_clients = MSCState,
                      unconfirmed_simple = sets:new([{version,2}]),
                      confirmed   = sets:union(C, UCS) }.
 
@@ -1349,6 +1352,10 @@ msg_store_client_init(MsgStore, Ref, MsgOnDiskFun, VHost) ->
     rabbit_vhost_msg_store:client_init(VHost, MsgStore,
                                        Ref, MsgOnDiskFun).
 
+msg_store_pre_hibernate({MSCStateP, MSCStateT}) ->
+    {rabbit_msg_store:client_pre_hibernate(MSCStateP),
+     rabbit_msg_store:client_pre_hibernate(MSCStateT)}.
+
 msg_store_write(MSCState, IsPersistent, SeqId, MsgId, Msg) ->
     with_immutable_msg_store_state(
       MSCState, IsPersistent,