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 506AA6A22D for ; Tue, 11 Aug 2020 14:31:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4DEBA1D48A for ; Tue, 11 Aug 2020 14:30:32 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 276241D47E for ; Tue, 11 Aug 2020 14:30:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EC13244562 for ; Tue, 11 Aug 2020 14:30:30 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 11 Aug 2020 14:30:24 +0200 Message-Id: <20200811123026.162364-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 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 manager 1/3] replication: refactor source checks on job creation 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: Tue, 11 Aug 2020 12:31:02 -0000 Signed-off-by: Fabian Grünbichler --- PVE/API2/ReplicationConfig.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/PVE/API2/ReplicationConfig.pm b/PVE/API2/ReplicationConfig.pm index b85e5804..a8c6213a 100644 --- a/PVE/API2/ReplicationConfig.pm +++ b/PVE/API2/ReplicationConfig.pm @@ -119,13 +119,20 @@ __PACKAGE__->register_method ({ my $vmlist = PVE::Cluster::get_vmlist(); my $guest_info = $vmlist->{ids}->{$guest}; + die "Guest '$guest' does not exist.\n" if !defined($guest_info); die "Target '$param->{target}' does not exist.\n" if defined($param->{target}) && !defined($nodelist->{$param->{target}}); + my $source = $guest_info->{node}; + die "Source '$param->{source}' does not match current node of guest '$guest'\n" + if defined($param->{source}) && $param->{source} ne $source; + + $param->{source} //= $source; + my $guest_class = $PVE::API2::Replication::lookup_guest_class->($guest_info->{type}); - my $guest_conf = $guest_class->load_config($guest, $guest_info->{node}); + my $guest_conf = $guest_class->load_config($guest, $source); my $rep_volumes = $guest_class->get_replicatable_volumes(PVE::Storage::config(), $guest, $guest_conf, 0, 0); die "No replicatable volumes found\n" if !%$rep_volumes; @@ -138,7 +145,6 @@ __PACKAGE__->register_method ({ my $opts = $plugin->check_config($id, $param, 1, 1); $opts->{guest} = $guest; - $opts->{source} //= $vmlist->{ids}->{$guest}->{node}; $cfg->{ids}->{$id} = $opts; -- 2.20.1