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 E266D6410F for ; Thu, 29 Oct 2020 14:31:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC4E19DF6 for ; Thu, 29 Oct 2020 14:31:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 223FD9DE5 for ; Thu, 29 Oct 2020 14:31:43 +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 C685845F82 for ; Thu, 29 Oct 2020 14:31:37 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 29 Oct 2020 14:31:27 +0100 Message-Id: <20201029133132.28100-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201029133132.28100-1-f.ebner@proxmox.com> References: <20201029133132.28100-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replicationconfig.pm] Subject: [pve-devel] [PATCH v2 guest-common 3/8] also update sources in switch_replication_job_target 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: Thu, 29 Oct 2020 13:31:43 -0000 Signed-off-by: Fabian Ebner --- Changes from v1: * iterate over values directly PVE/ReplicationConfig.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/PVE/ReplicationConfig.pm b/PVE/ReplicationConfig.pm index 65436ea..9dfb9da 100644 --- a/PVE/ReplicationConfig.pm +++ b/PVE/ReplicationConfig.pm @@ -228,23 +228,25 @@ 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; - - $jobcfg->{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(); }; - lock($transfer_job); -}; + lock($update_jobs); +} sub delete_job { my ($jobid) = @_; -- 2.20.1