Merge pull request #8212 from emqx/disc_copy_tables

fix: copy mnesia tables as disc_copies
This commit is contained in:
JianBo He 2022-06-15 09:54:15 +08:00 committed by GitHub
commit e72014ed00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 3 deletions

View File

@ -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, []}
]},
{<<".*">>, []}
],
[

View File

@ -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

View File

@ -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()).