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 BEE5B6222A for ; Mon, 21 Feb 2022 12:59:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF171181D1 for ; Mon, 21 Feb 2022 12:58:34 +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 75D6E18191 for ; Mon, 21 Feb 2022 12:58:33 +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 500E44237E for ; Mon, 21 Feb 2022 12:58:33 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Feb 2022 12:58:25 +0100 Message-Id: <20220221115828.76012-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220221115828.76012-1-f.ebner@proxmox.com> References: <20220221115828.76012-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.132 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 v3 guest-common 1/1] guest helpers: add run_with_replication_guard 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: Mon, 21 Feb 2022 11:59:04 -0000 Signed-off-by: Fabian Ebner --- New in v3. src/PVE/GuestHelpers.pm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/PVE/GuestHelpers.pm b/src/PVE/GuestHelpers.pm index 970c460..1183819 100644 --- a/src/PVE/GuestHelpers.pm +++ b/src/PVE/GuestHelpers.pm @@ -3,8 +3,9 @@ package PVE::GuestHelpers; use strict; use warnings; -use PVE::Tools; +use PVE::ReplicationConfig; use PVE::Storage; +use PVE::Tools; use POSIX qw(strftime); use Scalar::Util qw(weaken); @@ -82,6 +83,18 @@ sub guest_migration_lock { return $res; } +sub run_with_replication_guard { + my ($vmid, $timeout, $log, $func, @param) = @_; + + my $repl_conf = PVE::ReplicationConfig->new(); + if ($repl_conf->check_for_existing_jobs($vmid, 1)) { + $log->("checking/waiting for active replication..") if $log; + guest_migration_lock($vmid, $timeout, $func, @param); + } else { + $func->(@param); + } +} + sub check_hookscript { my ($volid, $storecfg) = @_; -- 2.30.2