b9507b
Fix issue added during rebase
Authored and Committed by 
peter
8 years ago
rabbitmq-common-0001-Avoid-RPC-roundtrips-while-listing-items.patch
CHANGED
|
@@ -15,7 +15,7 @@ Subject: [PATCH] Avoid RPC roundtrips while listing items
|
|
|
15
15
|
Part of https://github.com/rabbitmq/rabbitmq-server/pull/683
|
|
16
16
|
|
|
17
17
|
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
|
|
18
|
-
index 27b352a..
|
|
18
|
+
index 27b352a..e09e02c 100644
|
|
19
19
|
--- a/src/rabbit_amqqueue.erl
|
|
20
20
|
+++ b/src/rabbit_amqqueue.erl
|
|
21
21
|
|
|
@@ -60,7 +60,7 @@ index 27b352a..38300bd 100644
|
|
|
60
60
|
-spec stat(rabbit_types:amqqueue()) ->
|
|
61
61
|
{'ok', non_neg_integer(), non_neg_integer()}.
|
|
62
62
|
-spec delete_immediately(qpids()) -> 'ok'.
|
|
63
|
-
@@ -627,16 +623,
|
|
63
|
+
@@ -627,16 +623,18 @@ info_all(VHostPath, Items) ->
|
|
64
64
|
map(list(VHostPath), fun (Q) -> info(Q, Items) end) ++
|
|
65
65
|
map(list_down(VHostPath), fun (Q) -> info_down(Q, Items, down) end).
|
|
66
66
|
|
|
@@ -86,15 +86,10 @@ index 27b352a..38300bd 100644
|
|
|
86
86
|
+ rabbit_control_misc:emitting_map_with_exit_handler(
|
|
87
87
|
+ AggregatorPid, Ref, fun(Q) -> info_down(Q, Items, down) end,
|
|
88
88
|
+ list_down(VHostPath)).
|
|
89
|
-
+
|
|
90
|
-
+list_local(VHostPath) ->
|
|
91
|
-
+ [ Q || #amqqueue{state = State, pid=QPid} = Q <- list(VHostPath),
|
|
92
|
-
+ State =/= crashed,
|
|
93
|
-
+ node() =:= node(QPid) ].
|
|
94
89
|
|
|
95
90
|
info_local(VHostPath) ->
|
|
96
91
|
map(list_local(VHostPath), fun (Q) -> info(Q, [name]) end).
|
|
97
|
-
@@ -664,12 +
|
|
92
|
+
@@ -664,12 +662,17 @@ consumers_all(VHostPath) ->
|
|
98
93
|
map(list(VHostPath),
|
|
99
94
|
fun(Q) -> get_queue_consumer_info(Q, ConsumerInfoKeys) end)).
|
|
100
95
|
|