Handle queue not_found error

Author: ansd

deps/rabbit/src/rabbit_channel.erl

@@ -2126,7 +2126,12 @@ deliver_to_queues(XName,
             rabbit_misc:protocol_error(
               resource_error,
               "Stream coordinator unavailable for ~ts",
-              [rabbit_misc:rs(Resource)])
+              [rabbit_misc:rs(Resource)]);
+        {error, Reason} ->
+            rabbit_misc:protocol_error(
+              resource_error,
+              "failed to deliver message: ~tp",
+              [Reason])
     end.
 
 process_routing_mandatory(_Mandatory = true,

deps/rabbit/src/rabbit_queue_type.erl

@@ -666,14 +666,8 @@ deliver0(Qs, Message0, Options, #?STATE{} = State0) ->
               Mod = amqqueue:get_type(Q),
               QState = case Mod:supports_stateful_delivery() of
                            true ->
-                               try get_ctx(Q, State0) of
-                                   #ctx{state = S} ->
-                                       S
-                               catch exit:{not_found, _QRef} ->
-                                         %% This quorum queue or stream was deleted between routing and delivery
-                                         %% TODO fail gracefully by returning a rejected or accepted queue action instead of exiting the entire session/channel
-                                         exit(todo)
-                               end;
+                               #ctx{state = S} = get_ctx(Q, State0),
+                               S;
                            false ->
                                stateless
                        end,