Skip to content

Commit 439924a

Browse files
kjnilssonmergify[bot]
authored andcommitted
Ra v2.13.3
This contains a fix in the ra_directory module to ensure names can be deleted even when a Ra server has never been started during the current node lifetime. Also contains a small tweak to ensure the ra_directory:unregister_name is called before deleting a Ra data directory which is less likely to cause a corrupt state that will stop a Ra system from starting. (cherry picked from commit 42991f7) (cherry picked from commit a6a2f64) # Conflicts: # MODULE.bazel # rabbitmq-components.mk
1 parent 520930b commit 439924a

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

MODULE.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,13 @@ erlang_package.hex_package(
260260
name = "ra",
261261
build_file = "@rabbitmq-server//bazel:BUILD.ra",
262262
pkg = "ra",
263+
<<<<<<< HEAD
263264
sha256 = "1db9c7ed5e5183836c416dd2198c3b414f7542d15603944aa6f5034aef90c890",
264265
version = "2.11.0",
266+
=======
267+
sha256 = "038f026a4f43d7d35e4587ec3f7ef51830d79aa318abfd052d38c13eb09c26ee",
268+
version = "2.13.3",
269+
>>>>>>> a6a2f645e0 (Ra v2.13.3)
265270
)
266271

267272
erlang_package.git_package(

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,12 +1043,12 @@ cleanup_data_dir() ->
10431043
ok.
10441044

10451045
maybe_delete_data_dir(UId) ->
1046+
ra_directory:unregister_name(?RA_SYSTEM, UId),
10461047
Dir = ra_env:server_data_dir(?RA_SYSTEM, UId),
10471048
{ok, Config} = ra_log:read_config(Dir),
10481049
case maps:get(machine, Config) of
10491050
{module, rabbit_fifo, _} ->
1050-
ra_lib:recursive_delete(Dir),
1051-
ra_directory:unregister_name(?RA_SYSTEM, UId);
1051+
ra_lib:recursive_delete(Dir);
10521052
_ ->
10531053
ok
10541054
end.

rabbitmq-components.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,11 @@ dep_khepri = hex 0.14.0
123123
dep_khepri_mnesia_migration = hex 0.5.0
124124
dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
125125
dep_prometheus = hex 4.11.0
126+
<<<<<<< HEAD
126127
dep_ra = hex 2.11.0
128+
=======
129+
dep_ra = hex 2.13.3
130+
>>>>>>> a6a2f645e0 (Ra v2.13.3)
127131
dep_ranch = hex 2.1.0
128132
dep_recon = hex 2.5.3
129133
dep_redbug = hex 2.0.7

0 commit comments

Comments
 (0)