Skip to content

Commit 1acd7e5

Browse files
the-mikedavismergify[bot]
authored andcommitted
Handle Khepri timeouts when deleting MQTT QOS0 queues
(cherry picked from commit c37b192)
1 parent 8435a70 commit 1acd7e5

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,14 @@ declare(Q0, _Node) ->
113113
delete(Q, _IfUnused, _IfEmpty, ActingUser) ->
114114
QName = amqqueue:get_name(Q),
115115
log_delete(QName, amqqueue:get_exclusive_owner(Q)),
116-
ok = rabbit_amqqueue:internal_delete(Q, ActingUser),
117-
{ok, 0}.
116+
case rabbit_amqqueue:internal_delete(Q, ActingUser) of
117+
ok ->
118+
{ok, 0};
119+
{error, timeout} ->
120+
{protocol_error, internal_error,
121+
"The operation to delete ~ts from the metadata store timed "
122+
"out", [rabbit_misc:rs(QName)]}
123+
end.
118124

119125
-spec deliver([{amqqueue:amqqueue(), stateless}],
120126
Msg :: mc:state(),

0 commit comments

Comments
 (0)