From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 1/3] replication: refactor source checks on job creation
Date: Tue, 11 Aug 2020 14:30:24 +0200 [thread overview]
Message-ID: <20200811123026.162364-1-f.gruenbichler@proxmox.com> (raw)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
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
next reply other threads:[~2020-08-11 12:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 12:30 Fabian Grünbichler [this message]
2020-08-11 12:30 ` [pve-devel] [PATCH manager 2/3] replication: target is a required parameter Fabian Grünbichler
2020-08-11 12:31 ` [pve-devel] [PATCH manager 3/3] replication: check for source == target on job creation Fabian Grünbichler
2020-08-20 13:27 ` [pve-devel] applied-series: [PATCH manager 1/3] replication: refactor source checks " Thomas Lamprecht
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=20200811123026.162364-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@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