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 21A8B926A4 for ; Tue, 21 Mar 2023 17:45:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 02DAD1C3DA for ; Tue, 21 Mar 2023 17:44:57 +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 17:44:55 +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 6FA0745D85 for ; Tue, 21 Mar 2023 17:44:55 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Tue, 21 Mar 2023 17:44:52 +0100 Message-Id: <20230321164452.268358-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230321164452.268358-1-f.ebner@proxmox.com> References: <20230321164452.268358-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 2/2] pve: test: resource scheduling: add another test where memory is secondary to CPU 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 16:45:27 -0000 but this time, without any start load on the node. This test fails with librust-proxmox-resource-scheduling-dev=0.2.0-1 Signed-off-by: Fiona Ebner --- pve-rs/test/resource_scheduling.pl | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pve-rs/test/resource_scheduling.pl b/pve-rs/test/resource_scheduling.pl index c6724a4..e3b7d2e 100755 --- a/pve-rs/test/resource_scheduling.pl +++ b/pve-rs/test/resource_scheduling.pl @@ -86,16 +86,20 @@ sub test_overcommitted { is($nodes[3], "A", 'fourth should be A'); } -sub test_balance_small_memory_difference_with_start_load { +sub test_balance_small_memory_difference { + my ($with_start_load) = @_; + my $static = PVE::RS::ResourceScheduling::Static->new(); # Memory is different to avoid flaky results with what would otherwise be ties. $static->add_node("A", 8, 10_000_000_000); $static->add_node("B", 4, 9_000_000_000); $static->add_node("C", 4, 8_000_000_000); - $static->add_service_usage_to_node("A", { maxcpu => 4, maxmem => 1_000_000_000 }); - $static->add_service_usage_to_node("B", { maxcpu => 2, maxmem => 1_000_000_000 }); - $static->add_service_usage_to_node("C", { maxcpu => 2, maxmem => 1_000_000_000 }); + if ($with_start_load) { + $static->add_service_usage_to_node("A", { maxcpu => 4, maxmem => 1_000_000_000 }); + $static->add_service_usage_to_node("B", { maxcpu => 2, maxmem => 1_000_000_000 }); + $static->add_service_usage_to_node("C", { maxcpu => 2, maxmem => 1_000_000_000 }); + } my $service = { maxcpu => 3, @@ -134,6 +138,7 @@ sub test_balance_small_memory_difference_with_start_load { test_basic(); test_balance(); test_overcommitted(); -test_balance_small_memory_difference_with_start_load(); +test_balance_small_memory_difference(1); +test_balance_small_memory_difference(0); done_testing(); -- 2.30.2