is_recoverable/1: improve guards

michaelklishin · mergify[bot] · commit 78745a65d9fb · 2023-07-05T09:43:18.000Z
(cherry picked from commit 8dfcc9c) (cherry picked from commit 2f312d8)
diff --git a/deps/rabbit/src/rabbit_classic_queue.erl b/deps/rabbit/src/rabbit_classic_queue.erl
@@ -115,7 +115,7 @@ delete(Q, IfUnused, IfEmpty, ActingUser) when ?amqqueue_is_classic(Q) ->
             {ok, 0}
     end.
 
-is_recoverable(Q) when ?is_amqqueue(Q) ->
+is_recoverable(Q) when ?is_amqqueue(Q) and ?amqqueue_is_classic(Q) ->
     Node = node(),
     Node =:= amqqueue:qnode(Q) andalso
     %% Terminations on node down will not remove the rabbit_queue
diff --git a/deps/rabbit/src/rabbit_quorum_queue.erl b/deps/rabbit/src/rabbit_quorum_queue.erl
@@ -560,7 +560,7 @@ reductions(Name) ->
             0
     end.
 
-is_recoverable(Q) ->
+is_recoverable(Q) when ?is_amqqueue(Q) and ?amqqueue_is_quorum(Q) ->
     Node = node(),
     Nodes = get_nodes(Q),
     lists:member(Node, Nodes).

Original file line number	Diff line number	Diff line change
`@@ -560,7 +560,7 @@ reductions(Name) ->`
`560`	`560`	`0`
`561`	`561`	`end.`
`562`	`562`
`563`		`-is_recoverable(Q) ->`
	`563`	`+is_recoverable(Q) when ?is_amqqueue(Q) and ?amqqueue_is_quorum(Q) ->`
`564`	`564`	`Node = node(),`
`565`	`565`	`Nodes = get_nodes(Q),`
`566`	`566`	`lists:member(Node, Nodes).`