VZDump lock update, drop lock_aquire/lock_release

[pve-container.git] / src / PVE / VZDump / LXC.pm

diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 707ca391b4af6e6b1282d0a62f1130707d0a8009..57dcbe253610ed5f254cc68ad56db52c9eb94134 100644 (file)
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -94,24 +94,6 @@ my $check_mountpoint_empty = sub {
     });
 };
 
-my $lockconfig = sub {
-    my ($self, $vmid) = @_;
-    my $conf = PVE::LXC::load_config($vmid);
-    PVE::LXC::check_lock($conf);
-    $conf->{lock} = 'backup';
-    PVE::LXC::write_config($vmid, $conf);
-};
-
-my $unlockconfig = sub {
-    my ($self, $vmid) = @_;
-    my $conf = PVE::LXC::load_config($vmid);
-
-    if ($conf->{lock} && $conf->{lock} eq 'backup') {
-       delete $conf->{lock};
-       PVE::LXC::write_config($vmid, $conf);
-    }
-};
-
 sub prepare {
     my ($self, $task, $vmid, $mode) = @_;
 
@@ -128,6 +110,7 @@ sub prepare {
     my ($id_map, $rootuid, $rootgid) = PVE::LXC::parse_id_maps($conf);
     $task->{userns_cmd} = PVE::LXC::userns_command($id_map);
 
+    my $volid_list = [];
     PVE::LXC::foreach_mountpoint($conf, sub {
        my ($name, $data) = @_;
        my $volid = $data->{volume};
@@ -142,14 +125,17 @@ sub prepare {
        }
 
        push @$disks, $data;
+       push @$volid_list, $volid
+           if $type eq 'volume';
     });
-    my $volid_list = [map { $_->{volume} } @$disks];
 
     if ($mode eq 'snapshot') {
-       if (!PVE::LXC::has_feature('snapshot', $conf, $storage_cfg)) {
-           die "mode failure - some volumes does not support snapshots\n";
+       if (!PVE::LXC::has_feature('vzdump', $conf, $storage_cfg)) {
+           die "mode failure - some volumes do not support snapshots\n";
        }
 
+       unlock_vm($self, $vmid);
+
        if ($conf->{snapshots} && $conf->{snapshots}->{vzdump}) {
            $self->loginfo("found old vzdump snapshot (force removal)");
            PVE::LXC::snapshot_delete($vmid, 'vzdump', 1);
@@ -159,27 +145,26 @@ sub prepare {
        mkpath $rootdir;
        &$check_mountpoint_empty($rootdir);
 
-       # set snapshot_count (freezes CT it snapshot_count > 1)
+       # set snapshot_count (freezes CT if snapshot_count > 1)
        $task->{snapshot_count} = scalar(@$volid_list);
     } elsif ($mode eq 'stop') {
-       &$lockconfig($self, $vmid);
        my $rootdir = $default_mount_point;
        mkpath $rootdir;
        &$check_mountpoint_empty($rootdir);
        PVE::Storage::activate_volumes($storage_cfg, $volid_list);
     } elsif ($mode eq 'suspend') {
-       &$lockconfig($self, $vmid);
        my $pid = PVE::LXC::find_lxc_pid($vmid);
        foreach my $disk (@$disks) {
            $disk->{dir} = "/proc/$pid/root$disk->{mp}";
        }
        $task->{snapdir} = $task->{tmpdir};
     } else {
+       unlock_vm($self, $vmid);
        die "unknown mode '$mode'\n"; # should not happen
     }
 
     if ($mode ne 'suspend') {
-       # If we preform mount operations, let's unshare the mount namespace
+       # If we perform mount operations, let's unshare the mount namespace
        # to not influence the running host.
        PVE::Tools::unshare(PVE::Tools::CLONE_NEWNS);
        PVE::Tools::run_command(['mount', '--make-rprivate', '/']);
@@ -189,21 +174,41 @@ sub prepare {
 sub lock_vm {
     my ($self, $vmid) = @_;
 
-    PVE::LXC::lock_aquire($vmid);
+    my $lockconfig = sub {
+       my ($self, $vmid) = @_;
+
+       my $conf = PVE::LXC::load_config($vmid);
+
+       PVE::LXC::check_lock($conf);
+       $conf->{lock} = 'backup';
+
+       PVE::LXC::write_config($vmid, $conf);
+    };
+
+    PVE::LXC::lock_container($vmid, 10, $lockconfig, ($self, $vmid));
 }
 
 sub unlock_vm {
     my ($self, $vmid) = @_;
 
-    &$unlockconfig($self, $vmid);
+    my $unlockconfig = sub {
+       my ($self, $vmid) = @_;
+
+       my $conf = PVE::LXC::load_config($vmid);
+
+       if ($conf->{lock} && $conf->{lock} eq 'backup') {
+           delete $conf->{lock};
+           PVE::LXC::write_config($vmid, $conf);
+       }
+    };
 
-    PVE::LXC::lock_release($vmid);
+    PVE::LXC::lock_container($vmid, 60, $unlockconfig, ($self, $vmid));
 }
 
 sub snapshot {
     my ($self, $task, $vmid) = @_;
 
-    $self->loginfo("create storage snapshot snapshot");
+    $self->loginfo("create storage snapshot 'vzdump'");
 
     # todo: freeze/unfreeze if we have more than one volid
     PVE::LXC::snapshot_create($vmid, 'vzdump', "vzdump backup snapshot");
@@ -211,10 +216,11 @@ sub snapshot {
     
     # reload config
     my $conf = $self->{vmlist}->{$vmid} = PVE::LXC::load_config($vmid);
-    die "unable to read vzdump shanpshot config - internal error"
+    die "unable to read vzdump snapshot config - internal error"
        if !($conf->{snapshots} && $conf->{snapshots}->{vzdump});
 
     my $disks = $task->{disks};
+    #todo: reevaluate bind/dev mount handling when implementing snapshots for mps
     my $volid_list = [map { $_->{volume} } @$disks];
 
     my $rootdir = $default_mount_point;
@@ -332,12 +338,12 @@ sub archive {
     # note: --remove-files does not work because we do not 
     # backup all files (filters). tar complains:
     # Cannot rmdir: Directory not empty
-    # we we disable this optimization for now
+    # we disable this optimization for now
     #if ($snapdir eq $task->{tmpdir} && $snapdir =~ m|^$opts->{dumpdir}/|) {
     #       push @$tar, "--remove-files"; # try to save space
     #}
 
-    # The directory parameter can give a alternative directory as source.
+    # The directory parameter can give an alternative directory as source.
     # the second parameter gives the structure in the tar.
     push @$tar, "--directory=$tmpdir", './etc/vzdump/pct.conf';
     push @$tar, "./etc/vzdump/pct.fw" if $task->{fw};