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

Shared subscriber should be keyed by SharedName + Topic 

Prior to this change, if a producer session produces to two
or more shared subscriber groups, the previously picked subscriber
for sticky strategy may not be a valid member for the next group.
This commit is contained in:
spring2maz 2018-09-27 21:50:23 +02:00 committed by Feng Lee
parent 96b5d71a67
commit 3bab3cbd2a
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/emqx_shared_sub.erl
View File

@ -89,7 +89,7 @@ dispatch(Group, Topic, Delivery = #delivery{message = Msg, results = Results}) -
end. end.
pick(sticky, ClientId, Group, Topic) -> pick(sticky, ClientId, Group, Topic) ->
Sub0 = erlang:get(shared_sub_sticky), Sub0 = erlang:get({shared_sub_sticky, Group, Topic}),
case is_sub_alive(Sub0) of case is_sub_alive(Sub0) of
true -> true ->
%% the old subscriber is still alive %% the old subscriber is still alive
@ -99,32 +99,33 @@ pick(sticky, ClientId, Group, Topic) ->
%% randomly pick one for the first message %% randomly pick one for the first message
Sub = do_pick(random, ClientId, Group, Topic), Sub = do_pick(random, ClientId, Group, Topic),
%% stick to whatever pick result %% stick to whatever pick result
erlang:put(shared_sub_sticky, Sub), erlang:put({shared_sub_sticky, Group, Topic}, Sub),
Sub Sub
end; end;
pick(Strategy, ClientId, Group, Topic) -> pick(Strategy, ClientId, Group, Topic) ->
do_pick(Strategy, ClientId, Group, Topic). do_pick(Strategy, ClientId, Group, Topic).
do_pick(Strategy, ClientId, Group, Topic) -> do_pick(Strategy, ClientId, Group, Topic) ->
All = subscribers(Group, Topic), case subscribers(Group, Topic) of
pick_subscriber(Strategy, ClientId, All). [] -> false;
[Sub] -> Sub;
All -> pick_subscriber(Group, Topic, Strategy, ClientId, All)
end.
pick_subscriber(_, _ClientId, []) -> false; pick_subscriber(Group, Topic, Strategy, ClientId, Subs) ->
pick_subscriber(_, _ClientId, [Sub]) -> Sub; Nth = do_pick_subscriber(Group, Topic, Strategy, ClientId, length(Subs)),
pick_subscriber(Strategy, ClientId, Subs) ->
Nth = do_pick_subscriber(Strategy, ClientId, length(Subs)),
lists:nth(Nth, Subs). lists:nth(Nth, Subs).
do_pick_subscriber(random, _ClientId, Count) -> do_pick_subscriber(_Group, _Topic, random, _ClientId, Count) ->
rand:uniform(Count); rand:uniform(Count);
do_pick_subscriber(hash, ClientId, Count) -> do_pick_subscriber(_Group, _Topic, hash, ClientId, Count) ->
1 + erlang:phash2(ClientId) rem Count; 1 + erlang:phash2(ClientId) rem Count;
do_pick_subscriber(round_robin, _ClientId, Count) -> do_pick_subscriber(Group, Topic, round_robin, _ClientId, Count) ->
Rem = case erlang:get(shared_sub_round_robin) of Rem = case erlang:get({shared_sub_round_robin, Group, Topic}) of
undefined -> 0; undefined -> 0;
N -> (N + 1) rem Count N -> (N + 1) rem Count
end, end,
_ = erlang:put(shared_sub_round_robin, Rem), _ = erlang:put({shared_sub_round_robin, Group, Topic}, Rem),
Rem + 1. Rem + 1.
subscribers(Group, Topic) -> subscribers(Group, Topic) ->