yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12794 from SergeTupchiy/EMQX-12058-keep-inflight-insert-ts-after-retry 

fix(emqx_session_mem): keep msg inflight insert timestamp in Inflight…
This commit is contained in:
SergeTupchiy 2024-03-27 12:30:00 +02:00 committed by GitHub
parent ae5b511c83 a3b730ff10
commit 04371217e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/src/emqx_session_mem.erl
View File

@ -637,10 +637,10 @@ do_retry_delivery(
_ = emqx_session_events:handle_event(ClientInfo, {expired, Msg}), _ = emqx_session_events:handle_event(ClientInfo, {expired, Msg}),
{Acc, emqx_inflight:delete(PacketId, Inflight)}; {Acc, emqx_inflight:delete(PacketId, Inflight)};
false -> false ->
Msg1 = without_inflight_insert_ts(emqx_message:set_flag(dup, true, Msg)), Msg1 = emqx_message:set_flag(dup, true, Msg),
Update = Data#inflight_data{message = Msg1, timestamp = Now}, Update = Data#inflight_data{message = Msg1, timestamp = Now},
Inflight1 = emqx_inflight:update(PacketId, Update, Inflight), Inflight1 = emqx_inflight:update(PacketId, Update, Inflight),
{[{PacketId, Msg1} | Acc], Inflight1} {[{PacketId, without_inflight_insert_ts(Msg1)} | Acc], Inflight1}
end; end;
do_retry_delivery(_ClientInfo, PacketId, Data, Now, Acc, Inflight) -> do_retry_delivery(_ClientInfo, PacketId, Data, Now, Acc, Inflight) ->
Update = Data#inflight_data{timestamp = Now}, Update = Data#inflight_data{timestamp = Now},