From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 37293924ED for ; Tue, 21 Mar 2023 13:34:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 18A4018F98 for ; Tue, 21 Mar 2023 13:33:50 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Mar 2023 13:33:49 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C2F5745D08 for ; Tue, 21 Mar 2023 13:33:48 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 21 Mar 2023 13:33:44 +0100 Message-Id: <20230321123345.128141-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230321123345.128141-1-f.ebner@proxmox.com> References: <20230321123345.128141-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.002 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-perl-rs 1/2] pve: test: resource scheduling: use dedicated functions for tests X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Mar 2023 12:34:20 -0000 Signed-off-by: Fiona Ebner --- 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