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 145C961635 for ; Wed, 9 Feb 2022 14:08:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D4E4D1772 for ; Wed, 9 Feb 2022 14:07: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 id D35D21599 for ; Wed, 9 Feb 2022 14:07: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 A25AA4623A for ; Wed, 9 Feb 2022 14:07:55 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 9 Feb 2022 14:07:34 +0100 Message-Id: <20220209130750.902245-6-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209130750.902245-1-f.gruenbichler@proxmox.com> References: <20220209130750.902245-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.203 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v5 guest-common 1/3] migrate: add get_bwlimit helper 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: Wed, 09 Feb 2022 13:08:30 -0000 given a source and target storage query either locally or both locally and remotely and merge the result. Signed-off-by: Fabian Grünbichler --- Notes: new in v5, replaces merge_bwlimits previously in PVE::QemuMigrate src/PVE/AbstractMigrate.pm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/PVE/AbstractMigrate.pm b/src/PVE/AbstractMigrate.pm index a20b213..d90e5b7 100644 --- a/src/PVE/AbstractMigrate.pm +++ b/src/PVE/AbstractMigrate.pm @@ -342,4 +342,30 @@ sub switch_replication_job_target { } } +# merges local limit '$bwlimit' and a possible remote limit +sub get_bwlimit { + my ($self, $source, $target) = @_; + + my $local_sids = $self->{opts}->{remote} ? [$source] : [$source, $target]; + + my $bwlimit = PVE::Storage::get_bandwidth_limit('migration', $local_sids, $self->{opts}->{bwlimit}); + + if ($self->{opts}->{remote}) { + my $bwlimit_opts = { + operation => 'migration', + storages => [$target], + bwlimit => $self->{opts}->{bwlimit}, + }; + my $remote_bwlimit = PVE::Tunnel::write_tunnel($self->{tunnel}, 10, 'bwlimit', $bwlimit_opts); + if ($remote_bwlimit && $remote_bwlimit->{bwlimit}) { + $remote_bwlimit = $remote_bwlimit->{bwlimit}; + + $bwlimit = $remote_bwlimit + if (!$bwlimit || $bwlimit > $remote_bwlimit); + } + } + + return $bwlimit; +} + 1; -- 2.30.2