Merge pull request rabbitmq#5897 from rabbitmq/rabbitmq-server-5889-s…

…ac-coordinator-crash-in-monitors
Anwma · Sep 30, 2022 · e0a7cee · e0a7cee
2 parents d47ad8e + 3767401
commit e0a7cee
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/deps/rabbit/src/rabbit_stream_sac_coordinator.erl b/deps/rabbit/src/rabbit_stream_sac_coordinator.erl
@@ -379,7 +379,8 @@ ensure_monitors(#command_unregister_consumer{vhost = VirtualHost,
                 #?MODULE{groups = StreamGroups0, pids_groups = PidsGroups0} =
                     State0,
                 Monitors,
-                Effects) ->
+                Effects)
+    when is_map_key(Pid, PidsGroups0) ->
     GroupId = {VirtualHost, Stream, ConsumerName},
     #{Pid := PidGroup0} = PidsGroups0,
     PidGroup1 =

diff --git a/deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl b/deps/rabbit/test/rabbit_stream_sac_coordinator_SUITE.erl
@@ -260,6 +260,7 @@ ensure_monitors_test(_) ->
     ?assertEqual(#{self() => sac}, Monitors2),
     ?assertEqual([{monitor, process, self()}, {monitor, node, node()}],
                  Effects2),
+
     Group2 = cgroup([consumer(self(), 1, true)]),
 
     Command2 =
@@ -278,6 +279,21 @@ ensure_monitors_test(_) ->
     ?assertEqual(#{self() => sac}, Monitors3),
     ?assertEqual([], Effects3),
 
+    %% trying with an unknown connection PID
+    %% the function should not change anything
+    UnknownConnectionPid = spawn(fun() -> ok end),
+    PassthroughCommand =
+        unregister_consumer_command(<<"stream">>,
+                                    <<"app">>,
+                                    UnknownConnectionPid,
+                                    0),
+
+    {State3, Monitors3, Effects3} =
+        rabbit_stream_sac_coordinator:ensure_monitors(PassthroughCommand,
+                                                      State3,
+                                                      Monitors3,
+                                                      []),
+
     Command3 =
         unregister_consumer_command(<<"stream">>, <<"app">>, self(), 1),