Use rabbit:data_dir/0 instead of rabbit_mnesia:dir/0 where it makes sense

Some testcases are interested in RabbitMQ data directory, not Mnesia
directory per se. In this case, call `rabbit:data_dir/0` instead.

Author: dumbbell

deps/rabbit/test/per_vhost_msg_store_SUITE.erl

@@ -193,7 +193,7 @@ folder_size(Dir) ->
                        fun(F,Acc) -> filelib:file_size(F) + Acc end, 0).
 
 get_global_folder_size(Config) ->
-    BaseDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_mnesia, dir, []),
+    BaseDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit, data_dir, []),
     folder_size(BaseDir).
 
 vhost_dir(Vhost, Config) ->

deps/rabbitmq_cli/test/ctl/force_boot_command_test.exs

@@ -40,7 +40,7 @@ defmodule ForceBootCommandTest do
     stop_rabbitmq_app()
     on_exit(fn -> start_rabbitmq_app() end)
     assert @command.run([], context[:opts]) == :ok
-    data_dir = :rpc.call(get_rabbit_hostname(), :rabbit_mnesia, :dir, [])
+    data_dir = :rpc.call(get_rabbit_hostname(), :rabbit, :data_dir, [])
 
     path = Path.join(data_dir, "force_load")
     assert File.exists?(path)

deps/rabbitmq_cli/test/ctl/forget_cluster_node_command_test.exs

@@ -20,7 +20,7 @@ defmodule ForgetClusterNodeCommandTest do
       :rabbit_misc.rpc_call(node, :application, :get_env, [:rabbit, :plugins_dir])
 
     rabbitmq_home = :rabbit_misc.rpc_call(node, :code, :lib_dir, [:rabbit])
-    data_dir = :rabbit_misc.rpc_call(node, :rabbit_mnesia, :dir, [])
+    data_dir = :rabbit_misc.rpc_call(node, :rabbit, :data_dir, [])
 
     feature_flags_file =
       :rabbit_misc.rpc_call(node, :rabbit_feature_flags, :enabled_feature_flags_list_file, [])
@@ -63,34 +63,34 @@ defmodule ForgetClusterNodeCommandTest do
            )
   end
 
-  test "validate_execution_environment: offline forget without mnesia dir fails", context do
+  test "validate_execution_environment: offline forget without data dir fails", context do
     offline_opts =
       Map.merge(
         context[:opts],
         %{offline: true, node: :non_exist@localhost}
       )
 
-    opts_without_mnesia = Map.delete(offline_opts, :data_dir)
-    Application.put_env(:mnesia, :dir, "/tmp")
-    on_exit(fn -> Application.delete_env(:mnesia, :dir) end)
+    opts_without_data_dir = Map.delete(offline_opts, :data_dir)
+    Application.put_env(:rabbit, :data_dir, "/tmp")
+    on_exit(fn -> Application.delete_env(:rabbit, :data_dir) end)
 
     assert match?(
              :ok,
              @command.validate_execution_environment(
                ["other_node@localhost"],
-               opts_without_mnesia
+               opts_without_data_dir
              )
            )
 
-    Application.delete_env(:mnesia, :dir)
+    Application.delete_env(:rabbit, :data_dir)
     System.put_env("RABBITMQ_MNESIA_DIR", "/tmp")
     on_exit(fn -> System.delete_env("RABBITMQ_MNESIA_DIR") end)
 
     assert match?(
              :ok,
              @command.validate_execution_environment(
                ["other_node@localhost"],
-               opts_without_mnesia
+               opts_without_data_dir
              )
            )
 
@@ -102,15 +102,15 @@ defmodule ForgetClusterNodeCommandTest do
            )
   end
 
-  test "validate_execution_environment: online mode does not fail is mnesia is not loaded",
+  test "validate_execution_environment: online mode does not fail if database is not loaded",
        context do
-    opts_without_mnesia = Map.delete(context[:opts], :data_dir)
+    opts_without_data_dir = Map.delete(context[:opts], :data_dir)
 
     assert match?(
              :ok,
              @command.validate_execution_environment(
                ["other_node@localhost"],
-               opts_without_mnesia
+               opts_without_data_dir
              )
            )
   end

deps/rabbitmq_cli/test/ctl/rename_cluster_node_command_test.exs

@@ -20,7 +20,7 @@ defmodule RenameClusterNodeCommandTest do
       :rabbit_misc.rpc_call(node, :application, :get_env, [:rabbit, :plugins_dir])
 
     rabbitmq_home = :rabbit_misc.rpc_call(node, :code, :lib_dir, [:rabbit])
-    data_dir = :rabbit_misc.rpc_call(node, :rabbit_mnesia, :dir, [])
+    data_dir = :rabbit_misc.rpc_call(node, :rabbit, :data_dir, [])
 
     on_exit([], fn ->
       start_rabbitmq_app()
@@ -67,26 +67,26 @@ defmodule RenameClusterNodeCommandTest do
            )
   end
 
-  test "validate_execution_environment: not providing node mnesia dir fails validation",
+  test "validate_execution_environment: not providing node data dir fails validation",
        context do
-    opts_without_mnesia = Map.delete(context[:opts], :data_dir)
-    Application.put_env(:mnesia, :dir, "/tmp")
-    on_exit(fn -> Application.delete_env(:mnesia, :dir) end)
+    opts_without_data_dir = Map.delete(context[:opts], :data_dir)
+    Application.put_env(:rabbit, :data_dir, "/tmp")
+    on_exit(fn -> Application.delete_env(:rabbit, :data_dir) end)
 
     assert :ok ==
              @command.validate(
                ["some_node@localhost", "other_node@localhost"],
-               opts_without_mnesia
+               opts_without_data_dir
              )
 
-    Application.delete_env(:mnesia, :dir)
+    Application.delete_env(:rabbit, :data_dir)
     System.put_env("RABBITMQ_MNESIA_DIR", "/tmp")
     on_exit(fn -> System.delete_env("RABBITMQ_MNESIA_DIR") end)
 
     assert :ok ==
              @command.validate(
                ["some_node@localhost", "other_node@localhost"],
-               opts_without_mnesia
+               opts_without_data_dir
              )
 
     System.delete_env("RABBITMQ_MNESIA_DIR")