[pve-devel] [PATCH manager 1/3] replication: refactor source checks on job creation

[pve-devel] [PATCH manager 1/3] replication: refactor source checks on job creation

[Fabian Grünbichler]

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

[pve-devel] [PATCH manager 2/3] replication: target is a required parameter

[Fabian Grünbichler]

no need to check for definedness

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/ReplicationConfig.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/API2/ReplicationConfig.pm b/PVE/API2/ReplicationConfig.pm
index a8c6213a..4a25a92b 100644
--- a/PVE/API2/ReplicationConfig.pm
+++ b/PVE/API2/ReplicationConfig.pm
@@ -123,7 +123,7 @@ __PACKAGE__->register_method ({
 	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}});
+	    if !defined($nodelist->{$param->{target}});
 
 	my $source = $guest_info->{node};
 	die "Source '$param->{source}' does not match current node of guest '$guest'\n"
-- 
2.20.1

[pve-devel] [PATCH manager 3/3] replication: check for source == target on job creation

[Fabian Grünbichler]

and die.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/ReplicationConfig.pm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/PVE/API2/ReplicationConfig.pm b/PVE/API2/ReplicationConfig.pm
index 4a25a92b..aea3bff3 100644
--- a/PVE/API2/ReplicationConfig.pm
+++ b/PVE/API2/ReplicationConfig.pm
@@ -131,6 +131,9 @@ __PACKAGE__->register_method ({
 
 	$param->{source} //= $source;
 
+	die "Source and target must not be identical\n"
+	    if $param->{target} eq $source;
+
 	my $guest_class = $PVE::API2::Replication::lookup_guest_class->($guest_info->{type});
 	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);
-- 
2.20.1

[pve-devel] applied-series: [PATCH manager 1/3] replication: refactor source checks on job creation

[Thomas Lamprecht]

On 11.08.20 14:30, Fabian Grünbichler wrote:
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>  PVE/API2/ReplicationConfig.pm | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
>

applied series, thanks!