From 73a4816d9cd68305aab9619eca2b23272191dc0c Mon Sep 17 00:00:00 2001
From: k32 <10274441+k32@users.noreply.github.com>
Date: Fri, 15 Oct 2021 17:41:03 +0200
Subject: [PATCH] fix(mria): Hook up mria to emqx_machine

---
 apps/emqx_machine/src/emqx_cluster_rpc.erl    | 2 +-
 apps/emqx_machine/src/emqx_machine.erl        | 1 +
 apps/emqx_machine/src/emqx_machine_schema.erl | 6 +++---
 apps/emqx_prometheus/src/emqx_prometheus.erl  | 2 +-
 rebar.config.erl                              | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_machine/src/emqx_cluster_rpc.erl b/apps/emqx_machine/src/emqx_cluster_rpc.erl
index f7b755137..a55d17616 100644
--- a/apps/emqx_machine/src/emqx_cluster_rpc.erl
+++ b/apps/emqx_machine/src/emqx_cluster_rpc.erl
@@ -87,7 +87,7 @@ multicall(M, F, A, RequireNum, Timeout) when RequireNum =:= all orelse RequireNu
                 %% the initiate transaction must happened on core node
                 %% make sure MFA(in the transaction) and the transaction on the same node
                 %% don't need rpc again inside transaction.
-                case ekka_rlog_status:upstream_node(?EMQX_MACHINE_SHARD) of
+                case mria_status:upstream_node(?EMQX_MACHINE_SHARD) of
                     {ok, Node} -> gen_server:call({?MODULE, Node}, MFA, Timeout);
                     disconnected -> {error, disconnected}
                 end
diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
index 996f40bf7..1df7dba36 100644
--- a/apps/emqx_machine/src/emqx_machine.erl
+++ b/apps/emqx_machine/src/emqx_machine.erl
@@ -35,6 +35,7 @@ start() ->
     ok = set_backtrace_depth(),
     ok = print_otp_version_warning(),
     ok = load_config_files(),
+    mria:start(),
     ekka:start(),
     mria_rlog:wait_for_shards([?EMQX_MACHINE_SHARD], infinity),
     ok.
diff --git a/apps/emqx_machine/src/emqx_machine_schema.erl b/apps/emqx_machine/src/emqx_machine_schema.erl
index a124166e5..05c7d3ffa 100644
--- a/apps/emqx_machine/src/emqx_machine_schema.erl
+++ b/apps/emqx_machine/src/emqx_machine_schema.erl
@@ -139,7 +139,7 @@ fields("cluster") ->
           #{})}
     , {"db_backend",
         sc(hoconsc:enum([mnesia, rlog]),
-          #{ mapping => "ekka.db_backend"
+          #{ mapping => "mria.db_backend"
            , default => mnesia
            })}
     , {"rlog",
@@ -245,12 +245,12 @@ fields(cluster_k8s) ->
 fields("rlog") ->
     [ {"role",
        sc(hoconsc:enum([core, replicant]),
-          #{ mapping => "ekka.node_role"
+          #{ mapping => "mria.node_role"
            , default => core
            })}
     , {"core_nodes",
        sc(emqx_schema:comma_separated_atoms(),
-          #{ mapping => "ekka.core_nodes"
+          #{ mapping => "mria.core_nodes"
            , default => []
            })}
     ];
diff --git a/apps/emqx_prometheus/src/emqx_prometheus.erl b/apps/emqx_prometheus/src/emqx_prometheus.erl
index 0a7aaa8e4..4667de24f 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} = mria:cluster_info(),
+    #{running_nodes := Running, stopped_nodes := Stopped} = mria_mnesia:cluster_info(),
     [{nodes_running, length(Running)},
      {nodes_stopped, length(Stopped)}].
diff --git a/rebar.config.erl b/rebar.config.erl
index a3f32d0c4..d5ff6de80 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -60,7 +60,7 @@ community_plugin_overrides() ->
 %% Temporary workaround for a rebar3 erl_opts duplication
 %% bug. Ideally, we want to set this define globally
 snabbkaffe_overrides() ->
-    Apps = [snabbkaffe, ekka],
+    Apps = [snabbkaffe, ekka, mria],
     [{add, App, [{erl_opts, [{d, snk_kind, msg}]}]} || App <- Apps].
 
 config(HasElixir) ->