From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-perl-rs 1/2] pve: test: resource scheduling: use dedicated functions for tests
Date: Tue, 21 Mar 2023 13:33:44 +0100 [thread overview]
Message-ID: <20230321123345.128141-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20230321123345.128141-1-f.ebner@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
pve-rs/test/resource_scheduling.pl | 83 +++++++++++++++++-------------
1 file changed, 47 insertions(+), 36 deletions(-)
diff --git a/pve-rs/test/resource_scheduling.pl b/pve-rs/test/resource_scheduling.pl
index 4f5105f..9c48178 100755
--- a/pve-rs/test/resource_scheduling.pl
+++ b/pve-rs/test/resource_scheduling.pl
@@ -7,43 +7,54 @@ use Test::More;
use PVE::RS::ResourceScheduling::Static;
-my $static = PVE::RS::ResourceScheduling::Static->new();
-is(scalar($static->list_nodes()->@*), 0, 'node list empty');
-$static->add_node("A", 10, 100_000_000_000);
-is(scalar($static->list_nodes()->@*), 1, '1 node added');
-$static->add_node("B", 20, 200_000_000_000);
-is(scalar($static->list_nodes()->@*), 2, '2nd node');
-$static->add_node("C", 30, 300_000_000_000);
-is(scalar($static->list_nodes()->@*), 3, '3rd node');
-$static->remove_node("C");
-is(scalar($static->list_nodes()->@*), 2, '3rd removed should be 2');
-ok($static->contains_node("A"), 'should contain a node A');
-ok($static->contains_node("B"), 'should contain a node B');
-ok(!$static->contains_node("C"), 'should not contain a node C');
-
-my $service = {
- maxcpu => 4,
- maxmem => 20_000_000_000,
-};
-
-for (my $i = 0; $i < 15; $i++) {
- my $score_list = $static->score_nodes_to_start_service($service);
-
- # imitate HA manager
- my $scores = { map { $_->[0] => -$_->[1] } $score_list->@* };
- my @nodes = sort {
- $scores->{$a} <=> $scores->{$b} || $a cmp $b
- } keys $scores->%*;
-
- if ($i % 3 == 2) {
- is($nodes[0], "A", 'first should be A');
- is($nodes[1], "B", 'second should be A');
- } else {
- is($nodes[0], "B", 'first should be B');
- is($nodes[1], "A", 'second should be A');
- }
+sub test_basic {
+ my $static = PVE::RS::ResourceScheduling::Static->new();
+ is(scalar($static->list_nodes()->@*), 0, 'node list empty');
+ $static->add_node("A", 10, 100_000_000_000);
+ is(scalar($static->list_nodes()->@*), 1, '1 node added');
+ $static->add_node("B", 20, 200_000_000_000);
+ is(scalar($static->list_nodes()->@*), 2, '2nd node');
+ $static->add_node("C", 30, 300_000_000_000);
+ is(scalar($static->list_nodes()->@*), 3, '3rd node');
+ $static->remove_node("C");
+ is(scalar($static->list_nodes()->@*), 2, '3rd removed should be 2');
+ ok($static->contains_node("A"), 'should contain a node A');
+ ok($static->contains_node("B"), 'should contain a node B');
+ ok(!$static->contains_node("C"), 'should not contain a node C');
+}
- $static->add_service_usage_to_node($nodes[0], $service);
+sub test_balance {
+ my $static = PVE::RS::ResourceScheduling::Static->new();
+ $static->add_node("A", 10, 100_000_000_000);
+ $static->add_node("B", 20, 200_000_000_000);
+
+ my $service = {
+ maxcpu => 4,
+ maxmem => 20_000_000_000,
+ };
+
+ for (my $i = 0; $i < 15; $i++) {
+ my $score_list = $static->score_nodes_to_start_service($service);
+
+ # imitate HA manager
+ my $scores = { map { $_->[0] => -$_->[1] } $score_list->@* };
+ my @nodes = sort {
+ $scores->{$a} <=> $scores->{$b} || $a cmp $b
+ } keys $scores->%*;
+
+ if ($i % 3 == 2) {
+ is($nodes[0], "A", 'first should be A');
+ is($nodes[1], "B", 'second should be A');
+ } else {
+ is($nodes[0], "B", 'first should be B');
+ is($nodes[1], "A", 'second should be A');
+ }
+
+ $static->add_service_usage_to_node($nodes[0], $service);
+ }
}
+test_basic();
+test_balance();
+
done_testing();
--
2.30.2
next prev parent reply other threads:[~2023-03-21 12:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-21 12:33 [pve-devel] [PATCH-SERIES proxmox-{resource-scheduling, perl-rs}] fix scoring issue with overcommitted node Fiona Ebner
2023-03-21 12:33 ` [pve-devel] [PATCH proxmox-resource-scheduling 1/2] pve ha: fix scoring issue when a node is overcommitted compared to others Fiona Ebner
2023-03-21 12:33 ` [pve-devel] [PATCH proxmox-resource-scheduling 2/2] pve ha: fix typo in comment Fiona Ebner
2023-03-21 12:33 ` Fiona Ebner [this message]
2023-03-21 12:33 ` [pve-devel] [PATCH proxmox-perl-rs 2/2] pve: test: resource scheduling: add test with overcommitted node Fiona Ebner
2023-03-21 14:25 ` [pve-devel] applied-series: [PATCH-SERIES proxmox-{resource-scheduling, perl-rs}] fix scoring issue " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230321123345.128141-4-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox