From d14b8e7da9e86416c2c04e3094f44776d3d20aa3 Mon Sep 17 00:00:00 2001 From: k32 <10274441+k32@users.noreply.github.com> Date: Thu, 14 Oct 2021 21:49:07 +0200 Subject: [PATCH] chore(mria): ekka_rlog -> mria_rlog --- apps/emqx/src/emqx_app.erl | 2 +- apps/emqx/src/emqx_cm_registry.erl | 2 +- apps/emqx/src/emqx_router.erl | 2 +- apps/emqx_authn/src/emqx_authn_app.erl | 2 +- apps/emqx_authz/src/emqx_authz_app.erl | 2 +- apps/emqx_dashboard/src/emqx_dashboard_app.erl | 2 +- apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl | 2 +- apps/emqx_machine/src/emqx_cluster_rpc.erl | 2 +- apps/emqx_machine/src/emqx_machine.erl | 2 +- apps/emqx_machine/test/emqx_cluster_rpc_SUITE.erl | 2 +- apps/emqx_management/src/emqx_mgmt_app.erl | 2 +- apps/emqx_retainer/src/emqx_retainer_mnesia.erl | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/emqx/src/emqx_app.erl b/apps/emqx/src/emqx_app.erl index cd435b864..662439397 100644 --- a/apps/emqx/src/emqx_app.erl +++ b/apps/emqx/src/emqx_app.erl @@ -57,7 +57,7 @@ stop(_State) -> ok. ensure_ekka_started() -> ekka:start(), - ok = ekka_rlog:wait_for_shards(?BOOT_SHARDS, infinity). + ok = mria_rlog:wait_for_shards(?BOOT_SHARDS, infinity). %% @doc Call this function to make emqx boot without loading config, %% in case we want to delegate the config load to a higher level app diff --git a/apps/emqx/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl index c51660353..492c6dacd 100644 --- a/apps/emqx/src/emqx_cm_registry.erl +++ b/apps/emqx/src/emqx_cm_registry.erl @@ -108,7 +108,7 @@ init([]) -> {attributes, record_info(fields, channel)}, {storage_properties, [{ets, [{read_concurrency, true}, {write_concurrency, true}]}]}]), - ok = ekka_rlog:wait_for_shards([?CM_SHARD], infinity), + ok = mria_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 915b01dd6..ad63c6657 100644 --- a/apps/emqx/src/emqx_router.erl +++ b/apps/emqx/src/emqx_router.erl @@ -252,7 +252,7 @@ maybe_trans(Fun, Args) -> trans(Fun, Args); global -> %% Assert: - mnesia = ekka_rlog:backend(), %% TODO: do something smarter than just crash + mnesia = mria_rlog:backend(), %% TODO: do something smarter than just crash lock_router(), try mnesia:sync_dirty(Fun, Args) after diff --git a/apps/emqx_authn/src/emqx_authn_app.erl b/apps/emqx_authn/src/emqx_authn_app.erl index d297c9042..b71a3e16b 100644 --- a/apps/emqx_authn/src/emqx_authn_app.erl +++ b/apps/emqx_authn/src/emqx_authn_app.erl @@ -30,7 +30,7 @@ %%------------------------------------------------------------------------------ start(_StartType, _StartArgs) -> - ok = ekka_rlog:wait_for_shards([?AUTH_SHARD], infinity), + ok = mria_rlog:wait_for_shards([?AUTH_SHARD], infinity), {ok, Sup} = emqx_authn_sup:start_link(), ok = ?AUTHN:register_providers(providers()), ok = initialize(), diff --git a/apps/emqx_authz/src/emqx_authz_app.erl b/apps/emqx_authz/src/emqx_authz_app.erl index f868ac342..a5044443b 100644 --- a/apps/emqx_authz/src/emqx_authz_app.erl +++ b/apps/emqx_authz/src/emqx_authz_app.erl @@ -12,7 +12,7 @@ -export([start/2, stop/1]). start(_StartType, _StartArgs) -> - ok = ekka_rlog:wait_for_shards([?ACL_SHARDED], infinity), + ok = mria_rlog:wait_for_shards([?ACL_SHARDED], infinity), {ok, Sup} = emqx_authz_sup:start_link(), ok = emqx_authz:init(), {ok, Sup}. diff --git a/apps/emqx_dashboard/src/emqx_dashboard_app.erl b/apps/emqx_dashboard/src/emqx_dashboard_app.erl index 4e1b0caec..16acdb182 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_app.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_app.erl @@ -26,7 +26,7 @@ start(_StartType, _StartArgs) -> {ok, Sup} = emqx_dashboard_sup:start_link(), - ok = ekka_rlog:wait_for_shards([?DASHBOARD_SHARD], infinity), + ok = mria_rlog:wait_for_shards([?DASHBOARD_SHARD], infinity), _ = emqx_dashboard:start_listeners(), emqx_dashboard_cli:load(), ok = emqx_dashboard_admin:add_default_user(), diff --git a/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl b/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl index 7be7a28e2..b52d9c7dc 100644 --- a/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl +++ b/apps/emqx_gateway/src/mqttsn/emqx_sn_registry.erl @@ -148,7 +148,7 @@ init([InstaId, PredefTopics]) -> ]), ok = mria:wait_for_tables([Tab]), % FIXME: - %ok = ekka_rlog:wait_for_shards([?CM_SHARD], infinity), + %ok = mria_rlog:wait_for_shards([?CM_SHARD], infinity), MaxPredefId = lists:foldl( fun(#{id := TopicId, topic := TopicName0}, AccId) -> TopicName = iolist_to_binary(TopicName0), diff --git a/apps/emqx_machine/src/emqx_cluster_rpc.erl b/apps/emqx_machine/src/emqx_cluster_rpc.erl index e64623bdc..7ca6b3571 100644 --- a/apps/emqx_machine/src/emqx_cluster_rpc.erl +++ b/apps/emqx_machine/src/emqx_cluster_rpc.erl @@ -84,7 +84,7 @@ multicall(M, F, A, RequireNum, Timeout) when RequireNum =:= all orelse RequireNu MFA = {initiate, {M, F, A}}, Begin = erlang:monotonic_time(), InitRes = - case ekka_rlog:role() of + case mria_rlog:role() of core -> gen_server:call(?MODULE, MFA, Timeout); replicant -> %% the initiate transaction must happened on core node diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl index 0f8208b46..996f40bf7 100644 --- a/apps/emqx_machine/src/emqx_machine.erl +++ b/apps/emqx_machine/src/emqx_machine.erl @@ -36,7 +36,7 @@ start() -> ok = print_otp_version_warning(), ok = load_config_files(), ekka:start(), - ekka_rlog:wait_for_shards([?EMQX_MACHINE_SHARD], infinity), + mria_rlog:wait_for_shards([?EMQX_MACHINE_SHARD], infinity), ok. graceful_shutdown() -> diff --git a/apps/emqx_machine/test/emqx_cluster_rpc_SUITE.erl b/apps/emqx_machine/test/emqx_cluster_rpc_SUITE.erl index 8da2dd107..cf6c794a7 100644 --- a/apps/emqx_machine/test/emqx_cluster_rpc_SUITE.erl +++ b/apps/emqx_machine/test/emqx_cluster_rpc_SUITE.erl @@ -43,7 +43,7 @@ init_per_suite(Config) -> application:load(emqx), application:load(emqx_machine), ok = ekka:start(), - ok = ekka_rlog:wait_for_shards([?EMQX_MACHINE_SHARD], infinity), + ok = mria_rlog:wait_for_shards([?EMQX_MACHINE_SHARD], infinity), application:set_env(emqx_machine, cluster_call_max_history, 100), application:set_env(emqx_machine, cluster_call_clean_interval, 1000), application:set_env(emqx_machine, cluster_call_retry_interval, 900), diff --git a/apps/emqx_management/src/emqx_mgmt_app.erl b/apps/emqx_management/src/emqx_mgmt_app.erl index 8dc1651da..4dae30a97 100644 --- a/apps/emqx_management/src/emqx_mgmt_app.erl +++ b/apps/emqx_management/src/emqx_mgmt_app.erl @@ -28,7 +28,7 @@ start(_Type, _Args) -> {ok, Sup} = emqx_mgmt_sup:start_link(), - ok = ekka_rlog:wait_for_shards([?MANAGEMENT_SHARD], infinity), + ok = mria_rlog:wait_for_shards([?MANAGEMENT_SHARD], infinity), emqx_mgmt_cli:load(), {ok, Sup}. diff --git a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl index 478234def..0d112995f 100644 --- a/apps/emqx_retainer/src/emqx_retainer_mnesia.erl +++ b/apps/emqx_retainer/src/emqx_retainer_mnesia.erl @@ -59,7 +59,7 @@ create_resource(#{storage_type := StorageType}) -> {record_name, retained}, {attributes, record_info(fields, retained)}, {storage_properties, StoreProps}]), - ok = ekka_rlog:wait_for_shards([?RETAINER_SHARD], infinity), + ok = mria_rlog:wait_for_shards([?RETAINER_SHARD], infinity), case mnesia:table_info(?TAB, storage_type) of Copies -> ok; _Other ->