From 814623edae60e47c78e7c639866f78d4a80d9a1b Mon Sep 17 00:00:00 2001 From: k32 <10274441+k32@users.noreply.github.com> Date: Thu, 14 Oct 2021 20:51:36 +0200 Subject: [PATCH] chore(mria): ekka_mnesia:create_table -> mria:create_table --- apps/emqx/src/emqx_alarm.erl | 13 +++++-------- apps/emqx/src/emqx_banned.erl | 9 +++------ apps/emqx/src/emqx_cm_registry.erl | 5 ++--- apps/emqx/src/emqx_router.erl | 8 +++----- apps/emqx/src/emqx_router_helper.erl | 9 +++------ apps/emqx/src/emqx_shared_sub.erl | 9 +++------ apps/emqx/src/emqx_trie.erl | 9 +++------ .../emqx_enhanced_authn_scram_mnesia.erl | 9 +++------ .../src/simple_authn/emqx_authn_mnesia.erl | 9 +++------ apps/emqx_authz/src/emqx_authz_mnesia.erl | 8 +++----- apps/emqx_dashboard/src/emqx_dashboard_admin.erl | 8 +++----- .../src/emqx_dashboard_collection.erl | 8 +++----- apps/emqx_dashboard/src/emqx_dashboard_token.erl | 8 +++----- apps/emqx_gateway/src/emqx_gateway_cm_registry.erl | 7 +++---- apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl | 14 +++++--------- apps/emqx_machine/src/emqx_cluster_rpc.erl | 13 +++++-------- apps/emqx_modules/src/emqx_delayed.erl | 8 +++----- apps/emqx_modules/src/emqx_telemetry.erl | 8 +++----- apps/emqx_modules/test/emqx_delayed_SUITE.erl | 2 +- apps/emqx_modules/test/emqx_telemetry_SUITE.erl | 2 +- apps/emqx_prometheus/src/emqx_prometheus.erl | 2 +- apps/emqx_psk/src/emqx_psk.erl | 9 +++------ apps/emqx_retainer/src/emqx_retainer_mnesia.erl | 5 ++--- 23 files changed, 67 insertions(+), 115 deletions(-) diff --git a/apps/emqx/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl index 39d13cacd..6c4e348c4 100644 --- a/apps/emqx/src/emqx_alarm.erl +++ b/apps/emqx/src/emqx_alarm.erl @@ -95,21 +95,18 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?ACTIVATED_ALARM, + ok = mria:create_table(?ACTIVATED_ALARM, [{type, set}, - {disc_copies, [node()]}, + {storage, disc_copies}, {local_content, true}, {record_name, activated_alarm}, {attributes, record_info(fields, activated_alarm)}]), - ok = ekka_mnesia:create_table(?DEACTIVATED_ALARM, + ok = mria:create_table(?DEACTIVATED_ALARM, [{type, ordered_set}, - {disc_copies, [node()]}, + {storage, disc_copies}, {local_content, true}, {record_name, deactivated_alarm}, - {attributes, record_info(fields, deactivated_alarm)}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?ACTIVATED_ALARM, disc_copies), - ok = ekka_mnesia:copy_table(?DEACTIVATED_ALARM, disc_copies). + {attributes, record_info(fields, deactivated_alarm)}]). %%-------------------------------------------------------------------- %% API diff --git a/apps/emqx/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl index 86f79ede8..30f91da6e 100644 --- a/apps/emqx/src/emqx_banned.erl +++ b/apps/emqx/src/emqx_banned.erl @@ -58,16 +58,13 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?BANNED_TAB, [ + ok = mria:create_table(?BANNED_TAB, [ {type, set}, {rlog_shard, ?COMMON_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, banned}, {attributes, record_info(fields, banned)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?BANNED_TAB, disc_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). %% @doc Start the banned server. -spec(start_link() -> startlink_ret()). diff --git a/apps/emqx/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl index 65b89a884..c51660353 100644 --- a/apps/emqx/src/emqx_cm_registry.erl +++ b/apps/emqx/src/emqx_cm_registry.erl @@ -100,15 +100,14 @@ record(ClientId, ChanPid) -> %%-------------------------------------------------------------------- init([]) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {type, bag}, {rlog_shard, ?CM_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, channel}, {attributes, record_info(fields, channel)}, {storage_properties, [{ets, [{read_concurrency, true}, {write_concurrency, true}]}]}]), - ok = ekka_mnesia:copy_table(?TAB, ram_copies), ok = ekka_rlog:wait_for_shards([?CM_SHARD], infinity), ok = ekka:monitor(membership), {ok, #{}}. diff --git a/apps/emqx/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl index 4793100ba..0416d6d72 100644 --- a/apps/emqx/src/emqx_router.erl +++ b/apps/emqx/src/emqx_router.erl @@ -74,16 +74,14 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?ROUTE_TAB, [ + ok = mria:create_table(?ROUTE_TAB, [ {type, bag}, {rlog_shard, ?ROUTE_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, route}, {attributes, record_info(fields, route)}, {storage_properties, [{ets, [{read_concurrency, true}, - {write_concurrency, true}]}]}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?ROUTE_TAB, ram_copies). + {write_concurrency, true}]}]}]). %%-------------------------------------------------------------------- %% Start a router diff --git a/apps/emqx/src/emqx_router_helper.erl b/apps/emqx/src/emqx_router_helper.erl index 6542e3983..3fc3f42ce 100644 --- a/apps/emqx/src/emqx_router_helper.erl +++ b/apps/emqx/src/emqx_router_helper.erl @@ -59,16 +59,13 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?ROUTING_NODE, [ + ok = mria:create_table(?ROUTING_NODE, [ {type, set}, {rlog_shard, ?ROUTE_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, routing_node}, {attributes, record_info(fields, routing_node)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?ROUTING_NODE, ram_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). %%-------------------------------------------------------------------- %% API diff --git a/apps/emqx/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl index 299c4df38..9a3c7c74d 100644 --- a/apps/emqx/src/emqx_shared_sub.erl +++ b/apps/emqx/src/emqx_shared_sub.erl @@ -85,15 +85,12 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {type, bag}, {rlog_shard, ?SHARED_SUB_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, emqx_shared_subscription}, - {attributes, record_info(fields, emqx_shared_subscription)}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, ram_copies). + {attributes, record_info(fields, emqx_shared_subscription)}]). %%-------------------------------------------------------------------- %% API diff --git a/apps/emqx/src/emqx_trie.erl b/apps/emqx/src/emqx_trie.erl index 327db16c0..bf2afc910 100644 --- a/apps/emqx/src/emqx_trie.erl +++ b/apps/emqx/src/emqx_trie.erl @@ -61,16 +61,13 @@ mnesia(boot) -> StoreProps = [{ets, [{read_concurrency, true}, {write_concurrency, true} ]}], - ok = ekka_mnesia:create_table(?TRIE, [ + ok = mria:create_table(?TRIE, [ {rlog_shard, ?ROUTE_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, ?TRIE}, {attributes, record_info(fields, ?TRIE)}, {type, ordered_set}, - {storage_properties, StoreProps}]); -mnesia(copy) -> - %% Copy topics table - ok = ekka_mnesia:copy_table(?TRIE, ram_copies). + {storage_properties, StoreProps}]). %%-------------------------------------------------------------------- %% Topics APIs diff --git a/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl b/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl index 4f8b38b1e..d791d1aed 100644 --- a/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl +++ b/apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl @@ -63,15 +63,12 @@ %% @doc Create or replicate tables. -spec(mnesia(boot | copy) -> ok). mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {rlog_shard, ?AUTH_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, user_info}, {attributes, record_info(fields, user_info)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, disc_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). %%------------------------------------------------------------------------------ %% Hocon Schema diff --git a/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl b/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl index 314c3d578..590152aaf 100644 --- a/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl +++ b/apps/emqx_authn/src/simple_authn/emqx_authn_mnesia.erl @@ -70,15 +70,12 @@ %% @doc Create or replicate tables. -spec(mnesia(boot | copy) -> ok). mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {rlog_shard, ?AUTH_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, user_info}, {attributes, record_info(fields, user_info)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, disc_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). %%------------------------------------------------------------------------------ %% Hocon Schema diff --git a/apps/emqx_authz/src/emqx_authz_mnesia.erl b/apps/emqx_authz/src/emqx_authz_mnesia.erl index ab755403e..9c5ca458b 100644 --- a/apps/emqx_authz/src/emqx_authz_mnesia.erl +++ b/apps/emqx_authz/src/emqx_authz_mnesia.erl @@ -36,14 +36,12 @@ -spec(mnesia(boot | copy) -> ok). mnesia(boot) -> - ok = ekka_mnesia:create_table(?ACL_TABLE, [ + ok = mria:create_table(?ACL_TABLE, [ {type, ordered_set}, {rlog_shard, ?ACL_SHARDED}, - {disc_copies, [node()]}, + {storage, disc_copies}, {attributes, record_info(fields, ?ACL_TABLE)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?ACL_TABLE, disc_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). description() -> "AuthZ with Mnesia". diff --git a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl index 55cb8ffe5..f79eb92e5 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_admin.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_admin.erl @@ -50,16 +50,14 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(mqtt_admin, [ + ok = mria:create_table(mqtt_admin, [ {type, set}, {rlog_shard, ?DASHBOARD_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, mqtt_admin}, {attributes, record_info(fields, mqtt_admin)}, {storage_properties, [{ets, [{read_concurrency, true}, - {write_concurrency, true}]}]}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(mqtt_admin, disc_copies). + {write_concurrency, true}]}]}]). %%-------------------------------------------------------------------- %% API diff --git a/apps/emqx_dashboard/src/emqx_dashboard_collection.erl b/apps/emqx_dashboard/src/emqx_dashboard_collection.erl index 7ef5e0972..03c5bfcb3 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_collection.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_collection.erl @@ -41,14 +41,12 @@ -define(EXPIRE_INTERVAL, 86400000 * 7). mnesia(boot) -> - ok = ekka_mnesia:create_table(emqx_collect, [ + ok = mria:create_table(emqx_collect, [ {type, set}, {local_content, true}, - {disc_only_copies, [node()]}, + {storage, disc_only_copies}, {record_name, mqtt_collect}, - {attributes, record_info(fields, mqtt_collect)}]); -mnesia(copy) -> - mnesia:add_table_copy(emqx_collect, node(), disc_only_copies). + {attributes, record_info(fields, mqtt_collect)}]). start_link() -> gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). diff --git a/apps/emqx_dashboard/src/emqx_dashboard_token.erl b/apps/emqx_dashboard/src/emqx_dashboard_token.erl index 611ef44a2..5b38a163f 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_token.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_token.erl @@ -77,16 +77,14 @@ destroy_by_username(Username) -> do_destroy_by_username(Username). mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {type, set}, {rlog_shard, ?DASHBOARD_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, mqtt_admin_jwt}, {attributes, record_info(fields, mqtt_admin_jwt)}, {storage_properties, [{ets, [{read_concurrency, true}, - {write_concurrency, true}]}]}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, disc_copies). + {write_concurrency, true}]}]}]). %%-------------------------------------------------------------------- %% jwt apply diff --git a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl index 51c4e95c2..e82537285 100644 --- a/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl +++ b/apps/emqx_gateway/src/emqx_gateway_cm_registry.erl @@ -89,16 +89,15 @@ record(ClientId, ChanPid) -> init([Type]) -> Tab = tabname(Type), - ok = ekka_mnesia:create_table(Tab, [ + ok = mria:create_table(Tab, [ {type, bag}, {rlog_shard, ?CM_SHARD}, - {ram_copies, [node()]}, + {storage, ram_copies}, {record_name, channel}, {attributes, record_info(fields, channel)}, {storage_properties, [{ets, [{read_concurrency, true}, {write_concurrency, true}]}]}]), - ok = ekka_mnesia:copy_table(Tab, ram_copies), - %%ok = ekka_rlog:wait_for_shards([?CM_SHARD], infinity), + ok = mria:wait_for_tables([Tab]), ok = ekka:monitor(membership), {ok, #{type => Type}}. diff --git a/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl b/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl index e51c34dbf..3769aa7a7 100644 --- a/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl +++ b/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl @@ -63,13 +63,10 @@ %mnesia(boot) -> % %% Optimize storage % StoreProps = [{ets, [{read_concurrency, true}]}], -% ok = ekka_mnesia:create_table(?MODULE, [ +% ok = mria:create_table(?MODULE, [ % {attributes, record_info(fields, emqx_sn_registry)}, % {ram_copies, [node()]}, -% {storage_properties, StoreProps}]); -% -%mnesia(copy) -> -% ok = ekka_mnesia:copy_table(?MODULE, ram_copies). +% {storage_properties, StoreProps}]). -type registry() :: {Tab :: atom(), RegistryPid :: pid()}. @@ -141,15 +138,14 @@ init([InstaId, PredefTopics]) -> %% {ClientId, TopicId} -> TopicName %% {ClientId, TopicName} -> TopicId Tab = name(InstaId), - ok = ekka_mnesia:create_table(Tab, [ - {ram_copies, [node()]}, + ok = mria:create_table(Tab, [ + {storage, ram_copies}, {record_name, emqx_sn_registry}, {attributes, record_info(fields, emqx_sn_registry)}, {storage_properties, [{ets, [{read_concurrency, true}]}]}, {rlog_shard, ?SN_SHARD} ]), - ok = ekka_mnesia:copy_table(Tab, ram_copies), - ok = ekka_rlog:wait_for_shards([?SN_SHARD], infinity), + ok = mria:wait_for_tables([Tab]), % FIXME: %ok = ekka_rlog:wait_for_shards([?CM_SHARD], infinity), MaxPredefId = lists:foldl( diff --git a/apps/emqx_machine/src/emqx_cluster_rpc.erl b/apps/emqx_machine/src/emqx_cluster_rpc.erl index 0d93805b7..ebebd19a4 100644 --- a/apps/emqx_machine/src/emqx_cluster_rpc.erl +++ b/apps/emqx_machine/src/emqx_cluster_rpc.erl @@ -45,21 +45,18 @@ %%% API %%%=================================================================== mnesia(boot) -> - ok = ekka_mnesia:create_table(?CLUSTER_MFA, [ + ok = mria:create_table(?CLUSTER_MFA, [ {type, ordered_set}, {rlog_shard, ?EMQX_MACHINE_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, cluster_rpc_mfa}, {attributes, record_info(fields, cluster_rpc_mfa)}]), - ok = ekka_mnesia:create_table(?CLUSTER_COMMIT, [ + ok = mria:create_table(?CLUSTER_COMMIT, [ {type, set}, {rlog_shard, ?EMQX_MACHINE_SHARD}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, cluster_rpc_commit}, - {attributes, record_info(fields, cluster_rpc_commit)}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(cluster_rpc_mfa, disc_copies), - ok = ekka_mnesia:copy_table(cluster_rpc_commit, disc_copies). + {attributes, record_info(fields, cluster_rpc_commit)}]). start_link() -> start_link(node(), ?MODULE, get_retry_ms()). diff --git a/apps/emqx_modules/src/emqx_delayed.erl b/apps/emqx_modules/src/emqx_delayed.erl index f2eef3f39..15cafb614 100644 --- a/apps/emqx_modules/src/emqx_delayed.erl +++ b/apps/emqx_modules/src/emqx_delayed.erl @@ -64,14 +64,12 @@ %% Mnesia bootstrap %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {type, ordered_set}, - {disc_copies, [node()]}, + {storage, disc_copies}, {local_content, true}, {record_name, delayed_message}, - {attributes, record_info(fields, delayed_message)}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, disc_copies). + {attributes, record_info(fields, delayed_message)}]). %%-------------------------------------------------------------------- %% Hooks diff --git a/apps/emqx_modules/src/emqx_telemetry.erl b/apps/emqx_modules/src/emqx_telemetry.erl index 3c3f9bd6a..9a4881d9b 100644 --- a/apps/emqx_modules/src/emqx_telemetry.erl +++ b/apps/emqx_modules/src/emqx_telemetry.erl @@ -91,14 +91,12 @@ %%-------------------------------------------------------------------- mnesia(boot) -> - ok = ekka_mnesia:create_table(?TELEMETRY, + ok = mria:create_table(?TELEMETRY, [{type, set}, - {disc_copies, [node()]}, + {storage, disc_copies}, {local_content, true}, {record_name, telemetry}, - {attributes, record_info(fields, telemetry)}]); -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TELEMETRY, disc_copies). + {attributes, record_info(fields, telemetry)}]). %%-------------------------------------------------------------------- %% API diff --git a/apps/emqx_modules/test/emqx_delayed_SUITE.erl b/apps/emqx_modules/test/emqx_delayed_SUITE.erl index 3a070a1e8..81c2c1577 100644 --- a/apps/emqx_modules/test/emqx_delayed_SUITE.erl +++ b/apps/emqx_modules/test/emqx_delayed_SUITE.erl @@ -35,7 +35,7 @@ all() -> emqx_common_test_helpers:all(?MODULE). init_per_suite(Config) -> - ekka_mnesia:start(), + mria:start(), ok = emqx_delayed:mnesia(boot), emqx_common_test_helpers:start_apps([emqx_modules]), Config. diff --git a/apps/emqx_modules/test/emqx_telemetry_SUITE.erl b/apps/emqx_modules/test/emqx_telemetry_SUITE.erl index cf1ddff93..5380b55a6 100644 --- a/apps/emqx_modules/test/emqx_telemetry_SUITE.erl +++ b/apps/emqx_modules/test/emqx_telemetry_SUITE.erl @@ -28,7 +28,7 @@ all() -> emqx_common_test_helpers:all(?MODULE). init_per_suite(Config) -> - ok = ekka_mnesia:start(), + ok = mria:start(), ok = emqx_telemetry:mnesia(boot), emqx_common_test_helpers:start_apps([emqx_modules]), Config. diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl index bbdbab6b2..0a7aaa8e4 100644 --- a/apps/emqx_prometheus/src/emqx_prometheus.erl +++ b/apps/emqx_prometheus/src/emqx_prometheus.erl @@ -590,6 +590,6 @@ emqx_cluster() -> ]. emqx_cluster_data() -> - #{running_nodes := Running, stopped_nodes := Stopped} = ekka_mnesia:cluster_info(), + #{running_nodes := Running, stopped_nodes := Stopped} = mria:cluster_info(), [{nodes_running, length(Running)}, {nodes_stopped, length(Stopped)}]. diff --git a/apps/emqx_psk/src/emqx_psk.erl b/apps/emqx_psk/src/emqx_psk.erl index 65ce1025b..871276c24 100644 --- a/apps/emqx_psk/src/emqx_psk.erl +++ b/apps/emqx_psk/src/emqx_psk.erl @@ -64,16 +64,13 @@ %% @doc Create or replicate tables. -spec(mnesia(boot | copy) -> ok). mnesia(boot) -> - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {rlog_shard, ?PSK_SHARD}, {type, ordered_set}, - {disc_copies, [node()]}, + {storage, disc_copies}, {record_name, psk_entry}, {attributes, record_info(fields, psk_entry)}, - {storage_properties, [{ets, [{read_concurrency, true}]}]}]); - -mnesia(copy) -> - ok = ekka_mnesia:copy_table(?TAB, disc_copies). + {storage_properties, [{ets, [{read_concurrency, true}]}]}]). %%------------------------------------------------------------------------------ %% APIs diff --git a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl index 456ee6a9a..478234def 100644 --- a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl +++ b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl @@ -52,14 +52,13 @@ create_resource(#{storage_type := StorageType}) -> {read_concurrency, true}, {write_concurrency, true}]}, {dets, [{auto_save, 1000}]}], - ok = ekka_mnesia:create_table(?TAB, [ + ok = mria:create_table(?TAB, [ {type, set}, {rlog_shard, ?RETAINER_SHARD}, - {Copies, [node()]}, + {storage, Copies}, {record_name, retained}, {attributes, record_info(fields, retained)}, {storage_properties, StoreProps}]), - ok = ekka_mnesia:copy_table(?TAB, Copies), ok = ekka_rlog:wait_for_shards([?RETAINER_SHARD], infinity), case mnesia:table_info(?TAB, storage_type) of Copies -> ok;