Skip to content

Commit 1539e08

Browse files
michaelklishinmergify[bot]
authored andcommitted
Remove multiple mentions of global prefetch
As suggested by @johanrhodin in #12454. This keeps the Prometheus plugin part but marks it as deprecated. We can remove it in 4.1. (cherry picked from commit 80f4797)
1 parent 951b5ab commit 1539e08

File tree

6 files changed

+4
-12
lines changed

6 files changed

+4
-12
lines changed

deps/rabbit/docs/rabbitmqctl.8

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,6 @@ The number of not yet confirmed published messages.
942942
On channels not in confirm mode, this remains 0.
943943
.It Cm prefetch_count
944944
QoS prefetch limit for new consumers, 0 if unlimited.
945-
.It Cm global_prefetch_count
946-
QoS prefetch limit for the entire channel, 0 if unlimited.
947945
.El
948946
.Pp
949947
If no

deps/rabbit/src/rabbit_channel.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@
184184
acks_uncommitted,
185185
pending_raft_commands,
186186
prefetch_count,
187-
global_prefetch_count,
188187
state,
189188
garbage_collection]).
190189

@@ -2272,6 +2271,8 @@ i(pending_raft_commands, #ch{queue_states = QS}) ->
22722271
i(state, #ch{cfg = #conf{state = running}}) -> credit_flow:state();
22732272
i(state, #ch{cfg = #conf{state = State}}) -> State;
22742273
i(prefetch_count, #ch{cfg = #conf{consumer_prefetch = C}}) -> C;
2274+
%% Retained for backwards compatibility e.g. in mixed version clusters,
2275+
%% can be removed starting with 4.2. MK.
22752276
i(global_prefetch_count, #ch{limiter = Limiter}) ->
22762277
rabbit_limiter:get_prefetch_limit(Limiter);
22772278
i(interceptors, #ch{interceptor_state = IState}) ->

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_channels_command.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListChannelsCommand do
1616
@info_keys ~w(pid connection name number user vhost transactional
1717
confirm consumer_count messages_unacknowledged
1818
messages_uncommitted acks_uncommitted messages_unconfirmed
19-
prefetch_count global_prefetch_count)a
19+
prefetch_count)a
2020

2121
def info_keys(), do: @info_keys
2222

deps/rabbitmq_management/priv/www/js/tmpl/channel.ejs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<th>Prefetch count</th>
3939
<td><%= channel.prefetch_count %></td>
4040
</tr>
41-
<tr>
42-
<th>Global prefetch count</th>
43-
<td><%= channel.global_prefetch_count %></td>
44-
</tr>
4541
</table>
4642

4743
<table class="facts">

deps/rabbitmq_management/priv/www/js/tmpl/channels-list.ejs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@
157157
<% if (channel.prefetch_count != 0) { %>
158158
<%= channel.prefetch_count %><br/>
159159
<% } %>
160-
<% if (channel.global_prefetch_count != 0) { %>
161-
<%= channel.global_prefetch_count %> (global)
162-
<% } %>
163160
</td>
164161
<% } %>
165162
<% if (show_column('channels', 'msgs-unacked')) { %>

deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
{2, undefined, channel_messages_uncommitted, gauge, "Messages received in a transaction but not yet committed", messages_uncommitted},
171171
{2, undefined, channel_acks_uncommitted, gauge, "Message acknowledgements in a transaction not yet committed", acks_uncommitted},
172172
{2, undefined, consumer_prefetch, gauge, "Limit of unacknowledged messages for each consumer", prefetch_count},
173-
{2, undefined, channel_prefetch, gauge, "Total limit of unacknowledged messages for all consumers on a channel", global_prefetch_count}
173+
{2, undefined, channel_prefetch, gauge, "Deprecated and will be removed in a future version", global_prefetch_count}
174174
]},
175175

176176
{channel_exchange_metrics, [

0 commit comments

Comments
 (0)