Skip to content

Handle duplicate Mnesia push sessions #4586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badlop merged 1 commit into from
Jul 9, 2026
+25 −10
Merged

Handle duplicate Mnesia push sessions #4586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/mod_push.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,14 +623,16 @@ delete_session(LUser, LServer, ID) ->
-spec delete_session(binary(), binary(), jid(), binary()) -> ok | {error, err_reason()}.
delete_session(LUser, LServer, PushJID, Node) ->
Mod = gen_mod:db_mod(LServer, ?MODULE),
case Mod:lookup_session(LUser, LServer, PushJID, Node) of
{ok, {ID, _, _, _}} ->
delete_session(LUser, LServer, ID);
error ->
{error, notfound};
{error, _} = Err ->
Err
end.
LookupFun = fun() ->
case Mod:lookup_sessions(LUser, LServer, PushJID) of
{ok, Sessions} ->
{ok, [Session || {_, _, N, _} = Session <- Sessions,
N == Node]};
{error, _} = Err ->
Err
end
end,
delete_sessions(LUser, LServer, LookupFun, Mod).

-spec delete_sessions(binary(), binary(), jid()) -> ok | {error, err_reason()}.
delete_sessions(LUser, LServer, PushJID) ->
Expand Down
17 changes: 15 additions & 2 deletions src/mod_push_mnesia.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@ store_session(LUser, LServer, TS, PushJID, Node, XData) ->
PushLJID = jid:tolower(PushJID),
MaxSessions = ejabberd_sm:get_max_user_sessions(LUser, LServer),
F = fun() ->
Recs = mnesia:wread({push_session, US}),
lists:foreach(
fun(#push_session{service = P, node = N} = Rec)
when P == PushLJID, N == Node ->
mnesia:delete_object(Rec);
(_) ->
ok
end, Recs),
enforce_max_sessions(US, MaxSessions),
mnesia:write(#push_session{us = US,
timestamp = TS,
Expand All @@ -78,8 +86,13 @@ lookup_session(LUser, LServer, PushJID, Node) ->
N == Node ->
Rec
end),
case mnesia:dirty_select(push_session, MatchSpec) of
[#push_session{timestamp = TS, xml = El}] ->
Records = mnesia:dirty_select(push_session, MatchSpec),
SortedRecords = lists:sort(fun(#push_session{timestamp = TS1},
#push_session{timestamp = TS2}) ->
TS1 >= TS2
end, Records),
case SortedRecords of
[#push_session{timestamp = TS, xml = El} | _] ->
{ok, {TS, PushLJID, Node, decode_xdata(El)}};
[] ->
?DEBUG("No push session found for ~ts@~ts (~p, ~ts)",
Expand Down
Loading