Replicate mqtt_admin table into cluster

src/emqx_dashboard_admin.erl

@@ -21,6 +21,12 @@
 
 -include("emqx_dashboard.hrl").
 
+%% Mnesia bootstrap
+-export([mnesia/1]).
+
+-boot_mnesia({mnesia, [boot]}).
+-copy_mnesia({mnesia, [copy]}).
+
 %% API Function Exports
 -export([start_link/0]).
 
@@ -44,14 +50,29 @@
         , code_change/3
         ]).
 
--spec(start_link() -> {ok, pid()} | ignore | {error, any()}).
-start_link() ->
-    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+%%--------------------------------------------------------------------
+%% Mnesia bootstrap
+%%--------------------------------------------------------------------
+
+mnesia(boot) ->
+    ok = ekka_mnesia:create_table(mqtt_admin, [
+                {type, set},
+                {disc_copies, [node()]},
+                {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).
 
 %%--------------------------------------------------------------------
 %% API
 %%--------------------------------------------------------------------
 
+-spec(start_link() -> {ok, pid()} | ignore | {error, any()}).
+start_link() ->
+    gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
+
 -spec(add_user(binary(), binary(), binary()) -> ok | {error, any()}).
 add_user(Username, Password, Tags) when is_binary(Username), is_binary(Password) ->
     Admin = #mqtt_admin{username = Username, password = hash(Password), tags = Tags},
@@ -145,22 +166,13 @@ check(Username, Password) ->
 %%--------------------------------------------------------------------
 
 init([]) ->
-    % Create mqtt_admin table
-    ok = ekka_mnesia:create_table(mqtt_admin, [
-                {type, set},
-                {local_content, true}, %% local_content to avoid blocking on mnesia:wait_for_tables/2
-                {disc_copies, [node()]},
-                {record_name, mqtt_admin},
-                {attributes, record_info(fields, mqtt_admin)}]),
-    ok = ekka_mnesia:copy_table(mqtt_admin, disc_copies),
-    %% Wait???
-    %% mnesia:wait_for_tables([mqtt_admin], 5000),
-    % Init mqtt_admin table
+    mnesia:wait_for_tables([mqtt_admin], 5000),
+    %% Init mqtt_admin table
     add_default_user(binenv(default_user_username), binenv(default_user_passwd)),
     {ok, state}.
 
 handle_call(_Req, _From, State) ->
-    {reply, error,  State}.
+    {reply, error, State}.
 
 handle_cast(_Msg, State) ->
     {noreply, State}.

test/emqx_dashboard_SUITE.erl

@@ -36,6 +36,8 @@ groups() ->
     ].
 
 init_per_suite(Config) ->
+    ekka_mnesia:start(),
+    emqx_dashboard_admin:mnesia(boot),
     emqx_ct_helpers:start_apps([emqx, emqx_management, emqx_dashboard]),
     Config.