From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 guest-common 1/1] guest helpers: add run_with_replication_guard
Date: Mon, 21 Feb 2022 12:58:25 +0100 [thread overview]
Message-ID: <20220221115828.76012-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220221115828.76012-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2022-02-21 11:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 11:58 [pve-devel] [PATCH-SERIES guest-common/container/qemu-server] fix #3424: wait for active replication when deleting a snapshot Fabian Ebner
2022-02-21 11:58 ` Fabian Ebner [this message]
2022-02-22 9:41 ` [pve-devel] [PATCH v3 guest-common 1/1] guest helpers: add run_with_replication_guard Fabian Ebner
2022-02-22 10:27 ` Fabian Grünbichler
2022-02-22 13:44 ` Fabian Ebner
2022-02-21 11:58 ` [pve-devel] [PATCH v3 container 1/2] partially fix #3424: vzdump: cleanup: wait for active replication Fabian Ebner
2022-02-21 11:58 ` [pve-devel] [PATCH v3 container 2/2] fix #3424: api: snapshot delete: " Fabian Ebner
2022-02-21 11:58 ` [pve-devel] [PATCH v3 qemu-server 1/1] " Fabian Ebner
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=20220221115828.76012-2-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