From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common 4/6] Also update sources in switch_replication_job_target
Date: Mon, 10 Aug 2020 14:35:55 +0200 [thread overview]
Message-ID: <20200810123557.22618-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20200810123557.22618-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/ReplicationConfig.pm | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/PVE/ReplicationConfig.pm b/PVE/ReplicationConfig.pm
index 65436ea..fc3e792 100644
--- a/PVE/ReplicationConfig.pm
+++ b/PVE/ReplicationConfig.pm
@@ -228,23 +228,27 @@ sub find_local_replication_job {
return undef;
}
-# switch local replication job target
+# 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 {
my ($vmid, $old_target, $new_target) = @_;
- my $transfer_job = sub {
+ my $update_jobs = sub {
my $cfg = PVE::ReplicationConfig->new();
- my $jobcfg = find_local_replication_job($cfg, $vmid, $old_target);
-
- return if !$jobcfg;
+ foreach my $id (keys %{$cfg->{ids}}) {
+ my $jobcfg = $cfg->{ids}->{$id};
- $jobcfg->{target} = $new_target;
+ 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();
};
- lock($transfer_job);
-};
+ lock($update_jobs);
+}
sub delete_job {
my ($jobid) = @_;
--
2.20.1
next prev parent reply other threads:[~2020-08-10 12:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 12:35 [pve-devel] [PATCH manager 1/6] Set source when creating a new replication job Fabian Ebner
2020-08-10 12:35 ` [pve-devel] [PATCH guest-common 2/6] job_status: read only after acquiring the lock Fabian Ebner
2020-08-10 12:35 ` [pve-devel] [PATCH guest-common 3/6] Clarify what the source property is used for in a replication job Fabian Ebner
2020-08-10 12:35 ` Fabian Ebner [this message]
2020-08-10 12:35 ` [pve-devel] [PATCH/RFC guest-common 5/6] job_status: simplify fixup of jobs for stolen guests Fabian Ebner
2020-08-10 12:35 ` [pve-devel] [PATCH/RFC guest-common 6/6] job_status: return jobs with target local node Fabian Ebner
2020-08-11 9:20 ` Fabian Ebner
2020-08-13 10:06 ` Fabian Grünbichler
2020-08-11 12:31 ` [pve-devel] applied: [PATCH manager 1/6] Set source when creating a new replication job 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=20200810123557.22618-4-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