Skip to content

Commit 29f9e1c

Browse files
Merge pull request #8236 from rabbitmq/no-more-lazy
Remove "lazy" from Management and lazy-specific tests
2 parents e60a540 + f8a3643 commit 29f9e1c

File tree

9 files changed

+2
-236
lines changed

9 files changed

+2
-236
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ _APP_ENV = """[
117117
118118
%% rabbitmq-server#973
119119
{queue_explicit_gc_run_operation_threshold, 1000},
120-
{lazy_queue_explicit_gc_run_operation_threshold, 1000},
121120
{background_gc_enabled, false},
122121
{background_gc_target_interval, 60000},
123122
%% rabbitmq-server#589
@@ -451,11 +450,6 @@ rabbitmq_integration_suite(
451450
],
452451
)
453452

454-
rabbitmq_integration_suite(
455-
name = "lazy_queue_SUITE",
456-
size = "medium",
457-
)
458-
459453
rabbitmq_integration_suite(
460454
name = "list_consumers_sanity_check_SUITE",
461455
size = "medium",

deps/rabbit/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ define PROJECT_ENV
100100

101101
%% rabbitmq-server#973
102102
{queue_explicit_gc_run_operation_threshold, 1000},
103-
{lazy_queue_explicit_gc_run_operation_threshold, 1000},
104103
{background_gc_enabled, false},
105104
{background_gc_target_interval, 60000},
106105
%% rabbitmq-server#589
@@ -205,7 +204,6 @@ SLOW_CT_SUITES := backing_queue \
205204
eager_sync \
206205
feature_flags \
207206
health_check \
208-
lazy_queue \
209207
many_node_ha \
210208
metrics \
211209
msg_store \

deps/rabbit/app.bzl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -942,15 +942,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
942942
app_name = "rabbit",
943943
erlc_opts = "//:test_erlc_opts",
944944
)
945-
erlang_bytecode(
946-
name = "lazy_queue_SUITE_beam_files",
947-
testonly = True,
948-
srcs = ["test/lazy_queue_SUITE.erl"],
949-
outs = ["test/lazy_queue_SUITE.beam"],
950-
app_name = "rabbit",
951-
erlc_opts = "//:test_erlc_opts",
952-
deps = ["//deps/amqp_client:erlang_app"],
953-
)
954945
erlang_bytecode(
955946
name = "list_consumers_sanity_check_SUITE_beam_files",
956947
testonly = True,

deps/rabbit/test/backing_queue_SUITE.erl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
%% This Source Code Form is subject to the terms of the Mozilla Public
1+
% This Source Code Form is subject to the terms of the Mozilla Public
22
%% License, v. 2.0. If a copy of the MPL was not distributed with this
33
%% file, You can obtain one at https://mozilla.org/MPL/2.0/.
44
%%
@@ -43,8 +43,6 @@
4343
bq_queue_index,
4444
bq_queue_index_props,
4545
{variable_queue_default, [parallel], ?VARIABLE_QUEUE_TESTCASES},
46-
{variable_queue_lazy, [parallel], ?VARIABLE_QUEUE_TESTCASES ++
47-
[variable_queue_mode_change]},
4846
bq_variable_queue_delete_msg_store_files_callback,
4947
bq_queue_recover
5048
]).
@@ -142,8 +140,6 @@ init_per_group1(backing_queue_embed_limit_1024, Config) ->
142140
Config;
143141
init_per_group1(variable_queue_default, Config) ->
144142
rabbit_ct_helpers:set_config(Config, {variable_queue_type, default});
145-
init_per_group1(variable_queue_lazy, Config) ->
146-
rabbit_ct_helpers:set_config(Config, {variable_queue_type, lazy});
147143
%% @todo These groups are no longer used?
148144
init_per_group1(from_cluster_node1, Config) ->
149145
rabbit_ct_helpers:set_config(Config, {test_direction, {0, 1}});

deps/rabbit/test/channel_operation_timeout_test_queue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080

8181
io_batch_size,
8282

83-
%% default queue or lazy queue
83+
%% default queue (or lazy queue from 3.6 to 3.11)
8484
mode,
8585
version = 1,
8686
%% Fast path for confirms handling. Instead of having

deps/rabbit/test/lazy_queue_SUITE.erl

Lines changed: 0 additions & 208 deletions
This file was deleted.

deps/rabbitmq_management/priv/www/js/global.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,6 @@ var HELP = {
225225
'queue-max-age':
226226
'Sets the data retention for stream queues in time units </br>(Y=Years, M=Months, D=Days, h=hours, m=minutes, s=seconds).<br/>E.g. "1h" configures the stream to only keep the last 1 hour of received messages.</br></br>(Sets the x-max-age argument.)',
227227

228-
'queue-lazy':
229-
'Set the queue into lazy mode, keeping as many messages as possible on disk to reduce RAM usage; if not set, the queue will keep an in-memory cache to deliver messages as fast as possible.<br/>(Sets the "<a target="_blank" href="https://www.rabbitmq.com/lazy-queues.html">x-queue-mode</a>" argument.)',
230-
231228
'queue-version':
232229
'Set the queue version. Defaults to version 1.<br/>Version 1 has a journal-based index that embeds small messages.<br/>Version 2 has a different index which improves memory usage and performance in many scenarios, as well as a per-queue store for messages that were previously embedded.<br/>(Sets the "x-queue-version" argument.)',
233230

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
<span class="argument-link" field="definition" key="ha-promote-on-shutdown" type="string" value="">HA mirror promotion on shutdown</span> <span class="help" id="policy-ha-promote-on-shutdown"></span> |
119119
<span class="argument-link" field="definition" key="ha-promote-on-failure" type="string" value="">HA mirror promotion on failure</span> <span class="help" id="policy-ha-promote-on-failure"></span>
120120
</br>
121-
<span class="argument-link" field="definition" key="queue-mode" type="string" value="lazy">Lazy mode</span> |
122121
<span class="argument-link" field="definition" key="queue-version" type="number">Version</span> <span class="help" id="queue-version"></span> |
123122
<span class="argument-link" field="definition" key="queue-master-locator" type="string">Master locator</span></br>
124123
</td>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@
329329
<span class="argument-link" field="arguments" key="x-max-length-bytes" type="number">Max length bytes</span> <span class="help" id="queue-max-length-bytes"></span><br/>
330330
<% if (queue_type == "classic") { %>
331331
<span class="argument-link" field="arguments" key="x-max-priority" type="number">Maximum priority</span> <span class="help" id="queue-max-priority"></span>
332-
| <span class="argument-link" field="arguments" key="x-queue-mode" type="string" value="lazy">Lazy mode</span> <span class="help" id="queue-lazy"></span>
333332
| <span class="argument-link" field="arguments" key="x-queue-version" type="number">Version</span> <span class="help" id="queue-version"></span>
334333
| <span class="argument-link" field="arguments" key="x-queue-master-locator" type="string" value="">Master locator</span> <span class="help" id="queue-master-locator"></span>
335334
<% } %>

0 commit comments

Comments
 (0)