Skip to content

Commit 26a1ade

Browse files
Simplify
This code runs on server nodes, we can avoid using ctl commands.
1 parent 6967bb3 commit 26a1ade

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

test/unit_inbroker_parallel_SUITE.erl

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,21 +1499,18 @@ set_disk_free_limit_command(Config) ->
14991499
?MODULE, set_disk_free_limit_command1, [Config]).
15001500

15011501
set_disk_free_limit_command1(_Config) ->
1502-
ok = control_action(set_disk_free_limit,
1503-
["2000kiB"]),
1502+
rabbit_disk_monitor:set_disk_free_limit("2000kiB"),
15041503
2048000 = rabbit_disk_monitor:get_disk_free_limit(),
15051504

15061505
%% Use an integer
1507-
ok = control_action(set_disk_free_limit,
1508-
["mem_relative", "1"]),
1506+
rabbit_disk_monitor:set_disk_free_limit({mem_relative, 1}),
15091507
disk_free_limit_to_total_memory_ratio_is(1),
15101508

15111509
%% Use a float
1512-
ok = control_action(set_disk_free_limit,
1513-
["mem_relative", "1.5"]),
1510+
rabbit_disk_monitor:set_disk_free_limit({mem_relative, 1.5}),
15141511
disk_free_limit_to_total_memory_ratio_is(1.5),
15151512

1516-
ok = control_action(set_disk_free_limit, ["50MB"]),
1513+
rabbit_disk_monitor:set_disk_free_limit("50MB"),
15171514
passed.
15181515

15191516
disk_free_limit_to_total_memory_ratio_is(MemRatio) ->
@@ -1527,10 +1524,10 @@ set_vm_memory_high_watermark_command(Config) ->
15271524
?MODULE, set_vm_memory_high_watermark_command1, [Config]).
15281525

15291526
set_vm_memory_high_watermark_command1(_Config) ->
1530-
MemLimitRatio = "1.0",
1527+
MemLimitRatio = 1.0,
15311528
MemTotal = vm_memory_monitor:get_total_memory(),
15321529

1533-
ok = control_action(set_vm_memory_high_watermark, [MemLimitRatio]),
1530+
vm_memory_monitor:set_vm_memory_high_watermark(MemLimitRatio),
15341531
MemLimit = vm_memory_monitor:get_memory_limit(),
15351532
case MemLimit of
15361533
MemTotal -> ok;

0 commit comments

Comments
 (0)