From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Fri, 28 Apr 2017 08:34:46 +0000 (+0200)
Subject: migrate: cleanup replica volume skip condition
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=6e8044dcea4187d076f637b9e5d3e153d080087f

migrate: cleanup replica volume skip condition
---

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index d25e8be..ee6a3e9 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -861,16 +861,16 @@ sub phase3 {
 
     # destroy local copies
     foreach my $volid (@$volids) {
-
 	# do not destroy if new target is local_host
-	if (!($self->{vmconf}->{replica} && defined($synced_volumes->{$volid})
-	    && $self->{vmconf}->{replica_target} eq $self->{opts}->{node}) ) {
-	    eval { PVE::Storage::vdisk_free($self->{storecfg}, $volid); };
-	    if (my $err = $@) {
-		$self->log('err', "removing local copy of '$volid' failed - $err");
-		$self->{errors} = 1;
-		last if $err =~ /^interrupted by signal$/;
-	    }
+	next if $self->{vmconf}->{replica} &&
+	    defined($synced_volumes->{$volid}) &&
+	    $self->{vmconf}->{replica_target} eq $self->{opts}->{node};
+
+	eval { PVE::Storage::vdisk_free($self->{storecfg}, $volid); };
+	if (my $err = $@) {
+	    $self->log('err', "removing local copy of '$volid' failed - $err");
+	    $self->{errors} = 1;
+	    last if $err =~ /^interrupted by signal$/;
 	}
     }
 }