Merge pull request rabbitmq#4118 from rabbitmq/mergify/bp/v3.10.x/pr-…

…4117 Handle stream coordinator error response for topology request (backport rabbitmq#4117)
felixhuettner · Feb 7, 2022 · a4d1337 · a4d1337
2 parents 6df9a59 + 19a9fb8
commit a4d1337
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 31 deletions.
diff --git a/deps/rabbitmq_stream/src/rabbit_stream_manager.erl b/deps/rabbitmq_stream/src/rabbit_stream_manager.erl
@@ -11,7 +11,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is Pivotal Software, Inc.
-%% Copyright (c) 2020-2021 VMware, Inc. or its affiliates.  All rights reserved.
+%% Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
 %%
 
 -module(rabbit_stream_manager).
@@ -361,35 +361,33 @@ handle_call({topology, VirtualHost, Stream}, _From, State) ->
                       true ->
                           QState = amqqueue:get_type_state(Q),
                           #{name := StreamName} = QState,
-                          StreamMembers =
-                              case rabbit_stream_coordinator:members(StreamName)
-                              of
-                                  {ok, Members} ->
-                                      maps:fold(fun (_Node, {undefined, _Role},
-                                                     Acc) ->
-                                                        Acc;
-                                                    (LeaderNode, {_Pid, writer},
-                                                     Acc) ->
-                                                        Acc#{leader_node =>
-                                                                 LeaderNode};
-                                                    (ReplicaNode,
-                                                     {_Pid, replica}, Acc) ->
-                                                        #{replica_nodes :=
-                                                              ReplicaNodes} =
-                                                            Acc,
-                                                        Acc#{replica_nodes =>
-                                                                 ReplicaNodes
-                                                                 ++ [ReplicaNode]};
-                                                    (_Node, _, Acc) ->
-                                                        Acc
-                                                end,
-                                                #{leader_node => undefined,
-                                                  replica_nodes => []},
-                                                Members);
-                                  _ ->
-                                      {error, stream_not_found}
-                              end,
-                          {ok, StreamMembers};
+                          case rabbit_stream_coordinator:members(StreamName) of
+                              {ok, Members} ->
+                                  {ok,
+                                   maps:fold(fun (_Node, {undefined, _Role},
+                                                  Acc) ->
+                                                     Acc;
+                                                 (LeaderNode, {_Pid, writer},
+                                                  Acc) ->
+                                                     Acc#{leader_node =>
+                                                              LeaderNode};
+                                                 (ReplicaNode, {_Pid, replica},
+                                                  Acc) ->
+                                                     #{replica_nodes :=
+                                                           ReplicaNodes} =
+                                                         Acc,
+                                                     Acc#{replica_nodes =>
+                                                              ReplicaNodes
+                                                              ++ [ReplicaNode]};
+                                                 (_Node, _, Acc) ->
+                                                     Acc
+                                             end,
+                                             #{leader_node => undefined,
+                                               replica_nodes => []},
+                                             Members)};
+                              _ ->
+                                  {error, stream_not_available}
+                          end;
                       _ ->
                           {error, stream_not_found}
                   end;

diff --git a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@@ -9,7 +9,7 @@
 %% The Original Code is RabbitMQ.
 %%
 %% The Initial Developer of the Original Code is Pivotal Software, Inc.
-%% Copyright (c) 2020-2021 VMware, Inc. or its affiliates.  All rights reserved.
+%% Copyright (c) 2020-2022 VMware, Inc. or its affiliates.  All rights reserved.
 %%
 
 -module(rabbit_stream_reader).