fix #1779: vzdump: ensure guest-fsfreeze-thaw is called on error

[qemu-server.git] / PVE / VZDump / QemuServer.pm

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 163663957320edb9fe4906e34048727631d52fa6..70abe994b67dc1b4d4985e19b30356d9af80e7cc 100644 (file)
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -12,6 +12,7 @@ use PVE::Tools;
 use PVE::Storage::Plugin;
 use PVE::Storage;
 use PVE::QemuServer;
+use PVE::JSONSchema;
 use IO::File;
 use IPC::Open3;
 
@@ -22,7 +23,7 @@ sub new {
 
     PVE::VZDump::check_bin('qm');
 
-    my $self = bless { vzdump => $vzdump };
+    my $self = bless { vzdump => $vzdump }, $class;
 
     $self->{vmlist} = PVE::QemuServer::vzlist();
     $self->{storecfg} = PVE::Storage::config();
@@ -46,7 +47,10 @@ sub prepare {
 
     $task->{disks} = [];
 
-    my $conf = $self->{vmlist}->{$vmid} = PVE::QemuServer::load_config($vmid);
+    my $conf = $self->{vmlist}->{$vmid} = PVE::QemuConfig->load_config($vmid);
+
+    $self->loginfo("VM Name: $conf->{name}")
+       if defined($conf->{name});
 
     $self->{vm_was_running} = 1;
     if (!PVE::QemuServer::check_running($vmid)) {
@@ -64,15 +68,22 @@ sub prepare {
 
        return if PVE::QemuServer::drive_is_cdrom($drive);
 
+       my $volid = $drive->{file};
+
        if (defined($drive->{backup}) && !$drive->{backup}) {
-           $self->loginfo("exclude disk '$ds' (backup=no)");
+           $self->loginfo("exclude disk '$ds' '$volid' (backup=no)");
            return;
        } elsif ($drive->{iothread}) {
-           die "disk '$ds' (iothread=on) can't use backup feature currently. Please set backup=no for this drive";
+           die "disk '$ds' '$volid' (iothread=on) can't use backup feature currently. Please set backup=no for this drive";
+       } else {
+           my $log = "include disk '$ds' '$volid'";
+          if (defined $drive->{size}) {
+               my $readable_size = PVE::JSONSchema::format_size($drive->{size});
+               $log .= " $readable_size";
+          }
+           $self->loginfo($log);
        }
 
-       my $volid = $drive->{file};
-
        my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
        push @$vollist, $volid if $storeid;
        $drivehash->{$ds} = $drive;
@@ -168,7 +179,7 @@ sub resume_vm {
 sub assemble {
     my ($self, $task, $vmid) = @_;
 
-    my $conffile = PVE::QemuServer::config_file ($vmid);
+    my $conffile = PVE::QemuConfig->config_file($vmid);
 
     my $outfile = "$task->{tmpdir}/qemu-server.conf";
     my $firewall_src = "/etc/pve/firewall/$vmid.fw";
@@ -180,13 +191,21 @@ sub assemble {
        die "unable open '$conffile'";
 
     my $found_snapshot;
+    my $found_pending;
     while (defined (my $line = <$conffd>)) {
        next if $line =~ m/^\#vzdump\#/; # just to be sure
        next if $line =~ m/^\#qmdump\#/; # just to be sure
-       if ($line =~ m/^\[.*\]\s*$/) {
-           $found_snapshot = 1;
+       if ($line =~ m/^\[(.*)\]\s*$/) {
+           if ($1 =~ m/PENDING/i) {
+               $found_pending = 1;
+           } else {
+               $found_snapshot = 1;
+           }
        }
+
        next if $found_snapshot; # skip all snapshots data
+       next if $found_pending; # skip all pending changes
+
        if ($line =~ m/^unused\d+:\s*(\S+)\s*/) {
            $self->loginfo("skip unused drive '$1' (not included into backup)");
            next;
@@ -210,6 +229,10 @@ sub assemble {
        $self->loginfo("snapshots found (not included into backup)");
     }
 
+    if ($found_pending) {
+       $self->loginfo("pending configuration changes found (not included into backup)");
+    }
+
     PVE::Tools::file_copy($firewall_src, $firewall_dest) if -f $firewall_src;
 }
 
@@ -230,7 +253,7 @@ sub archive {
 
     my $diskcount = scalar(@{$task->{disks}});
 
-    if (PVE::QemuServer::is_template($self->{vmlist}->{$vmid}) || !$diskcount) {
+    if (PVE::QemuConfig->is_template($self->{vmlist}->{$vmid}) || !$diskcount) {
        my @pathlist;
        foreach my $di (@{$task->{disks}}) {
            if ($di->{type} eq 'block' || $di->{type} eq 'file') {
@@ -251,7 +274,7 @@ sub archive {
            $outcmd = "exec:cat";
        }
 
-       $outcmd .= ">$filename" if !$opts->{stdout};
+       $outcmd .= " > $filename" if !$opts->{stdout};
 
        my $cmd = ['/usr/bin/vma', 'create', '-v', '-c', $conffile];
        push @$cmd, '-c', $firewall if -e $firewall;
@@ -381,21 +404,29 @@ sub archive {
        $qmpclient->queue_cmd($vmid, $add_fd_cb, 'getfd',
                              fd => $outfileno, fdname => "backup");
 
-       if ($self->{vmlist}->{$vmid}->{agent} && $vm_is_running){
+       my $agent_running = 0;
+
+       if ($self->{vmlist}->{$vmid}->{agent} && $vm_is_running) {
+           $agent_running = PVE::QemuServer::qga_check_running($vmid);
+       }
+
+       if ($agent_running){
            eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-freeze"); };
            if (my $err = $@) {
                $self->logerr($err);
            }
        }
 
-       $qmpclient->queue_execute();
+       eval { $qmpclient->queue_execute() };
+       my $qmperr = $@;
 
-       if ($self->{vmlist}->{$vmid}->{agent} && $vm_is_running ){
+       if ($agent_running){
            eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-thaw"); };
            if (my $err = $@) {
                $self->logerr($err);
            }
        }
+       die $qmperr if $qmperr;
        die $qmpclient->{errors}->{$vmid} if $qmpclient->{errors}->{$vmid};
 
        if ($cpid) {
@@ -445,7 +476,7 @@ sub archive {
 
            my $statusline = "status: $per% ($transferred/$total), " .
                "sparse ${zero_per}% ($zero), duration $duration, " .
-               "$mbps_read/$mbps_write MB/s";
+               "read/write $mbps_read/$mbps_write MB/s";
            my $res = $status->{status} || 'unknown';
            if ($res ne 'active') {
                $self->loginfo($statusline);