From 8b64572820d5397585f9fb75e298d9c1fc10b26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnaud=20Cogolu=C3=A8gnes?=
 <514737+acogoluegnes@users.noreply.github.com>
Date: Fri, 27 Jun 2025 10:36:15 +0200
Subject: [PATCH] Close stream consumer log after stream is deleted or
 unavailable

References #14127

(cherry picked from commit 2f048b4b57bd6fc36c47d99e977e6d5a6dada161)
---
 deps/rabbitmq_stream/src/rabbit_stream_reader.erl | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
index ef0d0aa00e4c..492b74a7cc95 100644
--- a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
+++ b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl
@@ -3309,25 +3309,29 @@ clean_subscriptions(MemberPid, Stream,
       fun(SubId, {DelSubIds, Rqsts0}) ->
               #{SubId := Consumer} = Consumers,
               case {MemberPid, Consumer} of
-                  {undefined, _C} ->
+                  {undefined, #consumer{log = Log}} ->
                       rabbit_stream_metrics:consumer_cancelled(self(),
                                                                stream_r(Stream,
                                                                         C0),
                                                                SubId,
                                                                Username),
+
+                      close_log(Log),
                       Rqsts1 = maybe_unregister_consumer(
                                  VirtualHost, Consumer,
                                  single_active_consumer(Consumer),
                                  Rqsts0),
                       {[SubId | DelSubIds], Rqsts1};
                   {MemberPid,
-                   #consumer{configuration =
-                             #consumer_configuration{member_pid = MemberPid}}} ->
+                   #consumer{
+                      log = Log,
+                      configuration = #consumer_configuration{member_pid = MemberPid}}} ->
                       rabbit_stream_metrics:consumer_cancelled(self(),
                                                                stream_r(Stream,
                                                                         C0),
                                                                SubId,
                                                                Username),
+                      close_log(Log),
                       Rqsts1 = maybe_unregister_consumer(
                                  VirtualHost, Consumer,
                                  single_active_consumer(Consumer),