From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 guest-common 4/8] create nolock variant for switch_replication_job_target
Date: Thu, 29 Oct 2020 14:31:28 +0100 [thread overview]
Message-ID: <20201029133132.28100-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201029133132.28100-1-f.ebner@proxmox.com>
so that it can be used within job_status
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* this was part of the following patch
PVE/ReplicationConfig.pm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/PVE/ReplicationConfig.pm b/PVE/ReplicationConfig.pm
index 9dfb9da..6ba87ae 100644
--- a/PVE/ReplicationConfig.pm
+++ b/PVE/ReplicationConfig.pm
@@ -230,21 +230,26 @@ sub find_local_replication_job {
# makes old_target the new source for all local jobs of this guest
# makes new_target the target for the single local job with target old_target
+sub switch_replication_job_target_nolock {
+ my ($cfg, $vmid, $old_target, $new_target) = @_;
+
+ foreach my $jobcfg (values %{$cfg->{ids}}) {
+ next if $jobcfg->{guest} ne $vmid;
+ next if $jobcfg->{type} ne 'local';
+
+ $jobcfg->{target} = $new_target if $jobcfg->{target} eq $old_target;
+ $jobcfg->{source} = $old_target;
+ }
+ $cfg->write();
+}
+
sub switch_replication_job_target {
my ($vmid, $old_target, $new_target) = @_;
my $update_jobs = sub {
my $cfg = PVE::ReplicationConfig->new();
- foreach my $jobcfg (values %{$cfg->{ids}}) {
- next if $jobcfg->{guest} ne $vmid;
- next if $jobcfg->{type} ne 'local';
-
- $jobcfg->{target} = $new_target if $jobcfg->{target} eq $old_target;
- $jobcfg->{source} = $old_target;
- }
- $cfg->write();
+ $cfg->switch_replication_job_target_nolock($vmid, $old_target, $new_target);
};
-
lock($update_jobs);
}
--
2.20.1
next prev parent reply other threads:[~2020-10-29 13:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 13:31 [pve-devel] [PATCH-SERIES v2] some replication-related improvements Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH v2 guest-common 1/8] job_status: read only after acquiring the lock Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH v2 guest-common 2/8] clarify what the source property is used for in a replication job Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH v2 guest-common 3/8] also update sources in switch_replication_job_target Fabian Ebner
2020-10-29 13:31 ` Fabian Ebner [this message]
2020-10-29 13:31 ` [pve-devel] [PATCH v2 guest-common 5/8] job_status: simplify fixup of jobs for stolen guests Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH v2 qemu-server 6/8] Repeat check for replication target in locked section Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH v2 qemu-server 7/8] fix checks for transfering replication state/switching job target Fabian Ebner
2020-10-29 13:31 ` [pve-devel] [PATCH/RFC v2 qemu-server 8/8] don't migrate replicated VM whose replication job is marked for removal Fabian Ebner
2020-11-09 9:48 ` [pve-devel] applied-series: [PATCH-SERIES v2] some replication-related improvements Fabian Grünbichler
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=20201029133132.28100-5-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