Make type spec for osiris:stop_member/2 match reality

rabbitmq · Feb 21, 2024 · 5973d2b · 5973d2b
1 parent 3a170cc
commit 5973d2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/osiris.erl b/src/osiris.erl
@@ -145,8 +145,7 @@ start_replica(Node, Config) ->
     Mod = maps:get(replica_mod, Config, osiris_replica),
     osiris_member:start(Mod, Node, Config).
 
--spec stop_member(node(), osiris:config()) ->
-    ok | {error, not_found}.
+-spec stop_member(node(), osiris:config()) -> ok.
 stop_member(Node, Config) ->
     osiris_member:stop(Node, Config).
 

diff --git a/src/osiris_member.erl b/src/osiris_member.erl
@@ -18,8 +18,7 @@
 start(Mod, Node, Config) ->
     Mod:start(Node, Config).
 
--spec stop(node(), osiris:config()) ->
-    ok | {error, not_found}.
+-spec stop(node(), osiris:config()) -> ok.
 stop(Node, Config) ->
     ?SUP:stop_child(Node, Config).
 

diff --git a/test/osiris_SUITE.erl b/test/osiris_SUITE.erl
@@ -50,9 +50,9 @@ all_tests() ->
      cluster_restart_new_leader,
      cluster_delete,
      cluster_failure,
+     restart_replica,
      replica_reader_failure_should_stop_replica,
      start_cluster_invalid_replicas,
-     restart_replica,
      replica_unknown_command,
      diverged_replica,
      retention,
@@ -1020,13 +1020,13 @@ restart_replica(Config) ->
     _ = [osiris:write(LeaderE1Pid, undefined, N, [<<N:64/integer>>]) || N <- Msgs],
     wait_for_written(Msgs),
     timer:sleep(100),
-    ok = erpc:call(node(R1Pid), gen_server, stop, [R1Pid]),
+    ok = osiris:stop_member(node(R1Pid), Conf),
     _ = [osiris:write(LeaderE1Pid, undefined, N, [<<N:64/integer>>]) || N <- Msgs],
     wait_for_written(Msgs),
-    {ok, _Replica1b} = osiris_replica:start(node(R1Pid), Conf),
+    {ok, _Replica1b} = osiris:start_replica(node(R1Pid), Conf),
     _ = [osiris:write(LeaderE1Pid, undefined, N, [<<N:64/integer>>]) || N <- Msgs],
     wait_for_written(Msgs),
-    timer:sleep(1000),
+    [stop_peer(Ref) || {Ref, _} <- PeerStates],
     ok.