Ensure Ra servers are properly deleted from the dets table

when ra_directory:unregister_name/2 is called when a server has never been started on the system.
rabbitmq · Jul 19, 2024 · 3e102b9 · 3e102b9
1 parent f686d9c
commit 3e102b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/ra_directory.erl b/src/ra_directory.erl
@@ -99,6 +99,7 @@ unregister_name(#{directory := Directory,
             ok = dets:delete(DirRev, ServerName),
             UId;
         [] ->
+            _ = dets:select_delete(DirRev, [{{'_', UId}, [], [true]}]),
             UId
     end.
 

diff --git a/test/ra_directory_SUITE.erl b/test/ra_directory_SUITE.erl
@@ -65,7 +65,7 @@ end_per_testcase(_TestCase, _Config) ->
 
 basics(_Config) ->
     ok = ra_directory:init(?SYS),
-    UId = <<"test1">>,
+    UId = atom_to_binary(?FUNCTION_NAME),
     Self = self(),
     ok = ra_directory:register_name(?SYS, UId, Self, undefined,
                                     test1, <<"test_cluster_name">>),
@@ -92,11 +92,13 @@ basics(_Config) ->
 
 persistence(_Config) ->
     ok = ra_directory:init(?SYS),
-    UId = <<"test1">>,
+    UId = atom_to_binary(?FUNCTION_NAME),
     Self = self(),
     ok = ra_directory:register_name(?SYS, UId, Self, undefined, test1, <<"name">>),
     UId = ra_directory:uid_of(?SYS, test1),
     ok = ra_directory:deinit(?SYS),
     ok = ra_directory:init(?SYS),
     UId = ra_directory:uid_of(?SYS, test1),
+    UId = ra_directory:unregister_name(?SYS, UId),
+    ?assertEqual([], ra_directory:list_registered(?SYS)),
     ok.