]> git.proxmox.com Git - qemu-server.git/commitdiff
migrate: cleanup replica volume skip condition
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 28 Apr 2017 08:34:46 +0000 (10:34 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 28 Apr 2017 08:34:46 +0000 (10:34 +0200)
PVE/QemuMigrate.pm

index d25e8be65bcac8c64eb81ed937a3208f1be76dec..ee6a3e9a71788f0f4de0b9cc0197943e38e565fd 100644 (file)
@@ -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$/;
        }
     }
 }