diff --git a/src/emqx.appup.src b/src/emqx.appup.src index dbaeae143..c7a93eb58 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -3,6 +3,8 @@ {VSN, [ {"4.2.0", [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {add_module, emqx_congestion}, {load_module, emqx_alarm, brutal_purge, soft_purge, []}, @@ -33,6 +35,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {"4.2.1", [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {add_module, emqx_congestion}, {load_module, emqx_alarm, brutal_purge, soft_purge, []}, @@ -62,6 +66,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.[23]">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {add_module, emqx_congestion}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, @@ -89,6 +95,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.4">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, @@ -115,6 +123,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.5">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, @@ -140,6 +150,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.[6-7]">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, @@ -160,6 +172,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.8">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, @@ -175,6 +189,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.9">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, @@ -189,6 +205,8 @@ {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, {<<"4.2.10">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []}, {load_module, emqx_message, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []}, @@ -200,6 +218,10 @@ {load_module, emqx_sys, brutal_purge, soft_purge, []}, {load_module, emqx_plugins, brutal_purge, soft_purge, []} ]}, + {<<"4.2.11">>, [ + {load_module, emqx_alarm, brutal_purge, soft_purge, []}, + {load_module, emqx_banned, brutal_purge, soft_purge, []} + ]}, {<<".*">>, []} ], [ diff --git a/src/emqx_alarm.erl b/src/emqx_alarm.erl index d07354105..a2c51134d 100644 --- a/src/emqx_alarm.erl +++ b/src/emqx_alarm.erl @@ -113,8 +113,8 @@ mnesia(boot) -> {record_name, deactivated_alarm}, {attributes, record_info(fields, deactivated_alarm)}]); mnesia(copy) -> - ok = ekka_mnesia:copy_table(?ACTIVATED_ALARM), - ok = ekka_mnesia:copy_table(?DEACTIVATED_ALARM). + ok = ekka_mnesia:copy_table(?ACTIVATED_ALARM, disc_copies), + ok = ekka_mnesia:copy_table(?DEACTIVATED_ALARM, disc_copies). %%-------------------------------------------------------------------- %% API diff --git a/src/emqx_banned.erl b/src/emqx_banned.erl index 80f93be70..cbcd2e15f 100644 --- a/src/emqx_banned.erl +++ b/src/emqx_banned.erl @@ -62,7 +62,7 @@ mnesia(boot) -> {storage_properties, [{ets, [{read_concurrency, true}]}]}]); mnesia(copy) -> - ok = ekka_mnesia:copy_table(?BANNED_TAB). + ok = ekka_mnesia:copy_table(?BANNED_TAB, disc_copies). %% @doc Start the banned server. -spec(start_link() -> startlink_ret()).