]> git.proxmox.com Git - qemu-server.git/commitdiff
Revert "migrate: cleanup replica volume skip condition"
authorDietmar Maurer <dietmar@proxmox.com>
Sat, 6 May 2017 08:38:06 +0000 (10:38 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Sat, 6 May 2017 08:38:06 +0000 (10:38 +0200)
This reverts commit 6e8044dcea4187d076f637b9e5d3e153d080087f.

PVE/QemuMigrate.pm

index ee6a3e9a71788f0f4de0b9cc0197943e38e565fd..d25e8be65bcac8c64eb81ed937a3208f1be76dec 100644 (file)
@@ -861,16 +861,16 @@ sub phase3 {
 
     # destroy local copies
     foreach my $volid (@$volids) {
-       # do not destroy if new target is local_host
-       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$/;
+       # 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$/;
+           }
        }
     }
 }