Log storage_migrate output

and make it more clear where an error within storage_migrate came from.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/src/PVE/LXC/Migrate.pm b/src/PVE/LXC/Migrate.pm
index e48265760fc2a5503de1dcb198ac943af39f07d6..90d74b4384f6800e34a88f0f2edd09b85d27ecdf 100644 (file)
--- a/src/PVE/LXC/Migrate.pm
+++ b/src/PVE/LXC/Migrate.pm
@@ -292,7 +292,14 @@ sub phase1 {
            'with_snapshots' => $volhash->{$volid}->{snapshots},
        };
 
-       PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info}, $sid, $storage_migrate_opts);
+       my $logfunc = sub { $self->log('info', $_[0]); };
+       eval {
+           PVE::Storage::storage_migrate($self->{storecfg}, $volid, $self->{ssh_info},
+                                         $sid, $storage_migrate_opts, $logfunc);
+       };
+       if (my $err = $@) {
+           die "storage migration for '$volid' to storage '$sid' failed - $err\n";
+       }
     }
 
     my $conffile = PVE::LXC::Config->config_file($vmid);