root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #9790 from rabbitmq/qq-oldest-entry-timestamp-fd-leak-fix 

Fix a file descriptor leak in an aux command handler
This commit is contained in:
Michael Klishin 2023-10-26 09:18:42 -04:00 committed by GitHub
parent 2e9400ab06 14da3a1f82
commit 20b31791f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
deps/rabbit/src/rabbit_fifo.erl vendored
View File

@ -1103,18 +1103,19 @@ handle_aux(_RaState, cast, eol, #?AUX{name = Name} = Aux, Log, _) ->
ets:delete(rabbit_fifo_usage, Name),
{no_reply, Aux, Log};
handle_aux(_RaState, {call, _From}, oldest_entry_timestamp, Aux,
Log, #?MODULE{} = State) ->
Ts = case smallest_raft_index(State) of
%% if there are no entries, we return current timestamp
%% so that any previously obtained entries are considered older than this
undefined ->
erlang:system_time(millisecond);
Idx when is_integer(Idx) ->
%% TODO: make more defensive to avoid potential crash
{{_, _, {_, Meta, _, _}}, _Log1} = ra_log:fetch(Idx, Log),
#{ts := Timestamp} = Meta,
Timestamp
end,
Log0, #?MODULE{} = State) ->
{Ts, Log} = case smallest_raft_index(State) of
%% if there are no entries, we return current timestamp
%% so that any previously obtained entries are considered
%% older than this
undefined ->
{erlang:system_time(millisecond), Log0};
Idx when is_integer(Idx) ->
%% TODO: make more defensive to avoid potential crash
{{_, _, {_, Meta, _, _}}, Log1} = ra_log:fetch(Idx, Log0),
#{ts := Timestamp} = Meta,
{Timestamp, Log1}
end,
{reply, {ok, Ts}, Aux, Log};
handle_aux(_RaState, {call, _From}, {peek, Pos}, Aux0,
Log0, MacState) ->