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

fix(emqx_cm): catch noproc exception from rpc_call (#5048)

This commit is contained in:
JianBo He 2021-06-23 09:45:24 +08:00 committed by GitHub
parent 2c0916ff05
commit 3ddbdbc6c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emqx.appup.src
View File

@ -3,7 +3,8 @@
[ [
{"4.3.3", {"4.3.3",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]} {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_cm,brutal_purge,soft_purge,[]}
]}, ]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
@ -11,7 +12,9 @@
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}, {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]}, {load_module,emqx_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_cm,brutal_purge,soft_purge,[]}
]},
{"4.3.1", {"4.3.1",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]}, {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
@ -45,7 +48,8 @@
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.3.3", [{"4.3.3",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]} {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_cm,brutal_purge,soft_purge,[]}
]}, ]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
@ -53,7 +57,9 @@
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}, {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_connection,brutal_purge,soft_purge,[]}]}, {load_module,emqx_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_cm,brutal_purge,soft_purge,[]}
]},
{"4.3.1", {"4.3.1",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]}, {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},

3
src/emqx_cm.erl
View File

@ -294,6 +294,9 @@ do_discard_session(ClientId, Pid) ->
_ : {noproc, _} -> % emqx_connection: gen_server:call _ : {noproc, _} -> % emqx_connection: gen_server:call
?tp(debug, "session_already_gone", #{pid => Pid}), ?tp(debug, "session_already_gone", #{pid => Pid}),
ok; ok;
_ : {'EXIT', {noproc, _}} -> % rpc_call/3
?tp(debug, "session_already_gone", #{pid => Pid}),
ok;
_ : {{shutdown, _}, _} -> _ : {{shutdown, _}, _} ->
?tp(debug, "session_already_shutdown", #{pid => Pid}), ?tp(debug, "session_already_shutdown", #{pid => Pid}),
ok; ok;