cleanup: error messages

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index e48bf6ddd6bff50d314f6fba498c8b168c424df7..288a9cd14b6ac200f15051d4302d8262a5ac17a9 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -1643,7 +1643,7 @@ __PACKAGE__->register_method({
            },
            machine => get_standard_option('pve-qm-machine'),
            targetstorage => {
-               description => "Target migration storage . (1 = same storeid than original)",
+               description => "Target storage for the migration. (Can be '1' to use the same storage id as on the source node.)",
                type => 'string',
                optional => 1
            }
@@ -2753,7 +2753,7 @@ __PACKAGE__->register_method({
 
        my $vmid = extract_param($param, 'vmid');
 
-       raise_param_exc({ targetstorage => "Live Storage migration can only be done online" })
+       raise_param_exc({ targetstorage => "Live storage migration can only be done online." })
            if !$param->{online} && $param->{targetstorage};
 
        raise_param_exc({ force => "Only root may use this option." })

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index ed1bef66d349528935127d2516c6f8c7dbd25f17..a5de8d040ccf827a025bfc2432ccc9f5215342c5 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -596,7 +596,7 @@ sub phase2 {
        $self->{storage_migration_jobs} = {};
        $self->log('info', "starting storage migration");
 
-       die "the number of destination local disk is not equal to number of source local disk"
+       die "The number of local disks does not match between the source and the destination.\n"
            if (scalar(keys %{$self->{target_drive}}) != scalar @{$self->{online_local_volumes}});
        foreach my $drive (keys %{$self->{target_drive}}){
            my $nbd_uri = $self->{target_drive}->{$drive}->{nbd_uri};

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index c2fa20bda938b1b71dd1972937ff1e33b962ab0d..3c9d30a83355fc22fd7457c8ecd8e35dfa6a945a 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -5923,7 +5923,7 @@ sub qemu_drive_mirror {
 
        my $pid = fork();
        if (!defined($pid)) {
-           die "forking socat tunnel failed";
+           die "forking socat tunnel failed\n";
        } elsif ($pid == 0) {
            exec(@$cmd);
            warn "exec failed: $!\n";
@@ -5992,7 +5992,7 @@ sub qemu_drive_mirror_monitor {
                    next;
                }
 
-               die "$job: mirroring has been cancelled. Maybe do you have bad sectors?" if !defined($running_mirror_jobs->{$job});
+               die "$job: mirroring has been cancelled\n" if !defined($running_mirror_jobs->{$job});
 
                my $busy = $running_mirror_jobs->{$job}->{busy};
                my $ready = $running_mirror_jobs->{$job}->{ready};
@@ -6038,14 +6038,14 @@ sub qemu_drive_mirror_monitor {
 
                    foreach my $job (keys %$jobs) {
                        # try to switch the disk if source and destination are on the same guest
-                       print "$job : Try to complete block job\n";
+                       print "$job: Completing block job...\n";
 
                        eval { vm_mon_cmd($vmid, "block-job-complete", device => $job) };
                        if ($@ =~ m/cannot be completed/) {
-                           print "$job : block job cannot be complete. Try again \n";
+                           print "$job: Block job cannot be completed, try again.\n";
                            $err_complete++;
                        }else {
-                           print "$job : complete ok : flushing pending writes\n";
+                           print "$job: Completed successfully.\n";
                            $jobs->{$job}->{complete} = 1;
                            eval { qemu_blockjobs_finish_tunnel($vmid, $job, $jobs->{$job}->{pid}) } ;
                        }
@@ -6068,7 +6068,7 @@ sub qemu_blockjobs_cancel {
     my ($vmid, $jobs) = @_;
 
     foreach my $job (keys %$jobs) {
-       print "$job: try to cancel block job\n";
+       print "$job: Cancelling block job\n";
        eval { vm_mon_cmd($vmid, "block-job-cancel", device => $job); };
        $jobs->{$job}->{cancel} = 1;
     }
@@ -6083,8 +6083,8 @@ sub qemu_blockjobs_cancel {
 
        foreach my $job (keys %$jobs) {
 
-           if(defined($jobs->{$job}->{cancel}) && !defined($running_jobs->{$job})) {
-               print "$job : finished\n";
+           if (defined($jobs->{$job}->{cancel}) && !defined($running_jobs->{$job})) {
+               print "$job: Done.\n";
                eval { qemu_blockjobs_finish_tunnel($vmid, $job, $jobs->{$job}->{pid}) } ;
                delete $jobs->{$job};
            }