Merge pull request #11769 from rabbitmq/mergify/bp/v3.13.x/pr-11768

rabbitmq · Jul 20, 2024 · edb967c · edb967c
2 parents 520930b + 10babbb
commit edb967c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -260,8 +260,8 @@ erlang_package.hex_package(
     name = "ra",
     build_file = "@rabbitmq-server//bazel:BUILD.ra",
     pkg = "ra",
-    sha256 = "1db9c7ed5e5183836c416dd2198c3b414f7542d15603944aa6f5034aef90c890",
-    version = "2.11.0",
+    sha256 = "038f026a4f43d7d35e4587ec3f7ef51830d79aa318abfd052d38c13eb09c26ee",
+    version = "2.13.3",
 )
 
 erlang_package.git_package(

diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl
@@ -1043,12 +1043,12 @@ cleanup_data_dir() ->
     ok.
 
 maybe_delete_data_dir(UId) ->
+    _ = ra_directory:unregister_name(?RA_SYSTEM, UId),
     Dir = ra_env:server_data_dir(?RA_SYSTEM, UId),
     {ok, Config} = ra_log:read_config(Dir),
     case maps:get(machine, Config) of
         {module, rabbit_fifo, _} ->
-            ra_lib:recursive_delete(Dir),
-            ra_directory:unregister_name(?RA_SYSTEM, UId);
+            ra_lib:recursive_delete(Dir);
         _ ->
             ok
     end.

diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
@@ -123,7 +123,7 @@ dep_khepri = hex 0.14.0
 dep_khepri_mnesia_migration = hex 0.5.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
 dep_prometheus = hex 4.11.0
-dep_ra = hex 2.11.0
+dep_ra = hex 2.13.3
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.3
 dep_redbug = hex 2.0.7