Clear init finished and code refactor

Author: dcorbacho

deps/rabbit/src/rabbit.erl

@@ -467,6 +467,7 @@ stop() ->
                     Product = product_name(),
                     ?LOG_INFO("~ts is asked to stop...", [Product],
                               #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}),
+                    rabbit_db:clear_init_finished(),
                     do_stop(),
                     ?LOG_INFO(
                       "Successfully stopped ~ts and its dependencies",

deps/rabbit/src/rabbit_db.erl

@@ -23,7 +23,8 @@
          is_virgin_node/0, is_virgin_node/1,
          dir/0,
          ensure_dir_exists/0,
-         is_init_finished/0]).
+         is_init_finished/0,
+         clear_init_finished/0]).
 
 %% Exported to be used by various rabbit_db_* modules
 -export([
@@ -76,20 +77,6 @@ init() ->
             Error
     end.
 
-init_finished() ->
-    %% Used during initialisation by rabbit_logger_exchange_h.erl
-    %% If an exchange logger is configured, it needs to declare the
-    %% exchange. For this, it requires the metadata store to be
-    %% initialised. The initialisation happens on a rabbit boot step,
-    %% after the second phase of the prelaunch where the logger is
-    %% configured.
-    %% Using this persistent term the logger exchange can delay
-    %% declaring the exchange until the metadata store is ready.
-    persistent_term:put(?PT_KEY_INIT_FINISHED, true).
-
-is_init_finished() ->
-    persistent_term:get(?PT_KEY_INIT_FINISHED, false).
-
 pre_init(IsVirgin) ->
     Members = rabbit_db_cluster:members(),
     OtherMembers = rabbit_nodes:nodes_excl_me(Members),
@@ -120,6 +107,23 @@ init_using_khepri() ->
                #{domain => ?RMQLOG_DOMAIN_DB})
     end.
 
+init_finished() ->
+    %% Used during initialisation by rabbit_logger_exchange_h.erl
+    %% If an exchange logger is configured, it needs to declare the
+    %% exchange. For this, it requires the metadata store to be
+    %% initialised. The initialisation happens on a rabbit boot step,
+    %% after the second phase of the prelaunch where the logger is
+    %% configured.
+    %% Using this persistent term the logger exchange can delay
+    %% declaring the exchange until the metadata store is ready.
+    persistent_term:put(?PT_KEY_INIT_FINISHED, true).
+
+is_init_finished() ->
+    persistent_term:get(?PT_KEY_INIT_FINISHED, false).
+
+clear_init_finished() ->
+    persistent_term:erase(?PT_KEY_INIT_FINISHED).
+
 -spec reset() -> Ret when
       Ret :: ok.
 %% @doc Resets the database and the node.