From d37ad38e7a25f885ca03dd535c2e55074fba063e Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 28 Oct 2022 15:43:02 +0800
Subject: [PATCH] chore: clear_table mqtt_admin when failed

---
 lib-ce/emqx_dashboard/src/emqx_dashboard.app.src   |  2 +-
 lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
index cb36b99a8..07c67545b 100644
--- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
@@ -1,6 +1,6 @@
 {application, emqx_dashboard,
  [{description, "EMQ X Web Dashboard"},
-  {vsn, "4.3.19"}, % strict semver, bump manually!
+  {vsn, "4.3.18"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_dashboard_sup]},
   {applications, [kernel,stdlib,mnesia,minirest]},
diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl b/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl
index 402f3e304..a0f62e7bd 100644
--- a/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl
+++ b/lib-ce/emqx_dashboard/src/emqx_dashboard_admin.erl
@@ -212,9 +212,9 @@ add_bootstrap_users(File, 0) ->
                 ok -> ok;
                 Error ->
                     %% if failed add bootstrap users, we should clear all bootstrap users
-                    {atomic, ok} = mnesia:transaction(fun clear_bootstrap_users/0, []),
+                    {atomic, ok} = mnesia:clear_table(mqtt_admin),
                     Error
-                    end;
+            end;
         {error, Reason} = Error ->
             ?LOG(error,
                 "failed to open the dashboard bootstrap users file(~s) for ~p",
@@ -258,14 +258,6 @@ add_bootstrap_user(File, Dev, MP, Line) ->
             throw(#{file => File, line => Line, reason => Error})
     end.
 
-clear_bootstrap_users() ->
-    FoldFun =
-        fun(#mqtt_admin{tags = ?BOOTSTRAP_USER_TAG} = User, Acc) ->
-            mnesia:delete_object(User), Acc;
-            (_, Acc) -> Acc
-        end,
-    mnesia:foldl(FoldFun, ok, mqtt_admin).
-
 bad_login_penalty() ->
     timer:sleep(2000),
     ok.