Since VZDump was the only user of lock_aquire and
lock_release, and does not actually need this split,
we can merge lock_aquire and lock_release into
lock_container.
---
This allows us to drop the locking code from
lock_container altogether as soon as the
refcounting patch for PVE::Tools::lock_file_full
is merged into pve-common.
Afterwards, PVE::LXC::lock_container and
PVE::QemuServer::lock_config[_XX] could
be merged into a common code base in
pve-common.
src/PVE/LXC.pm | 26 +++++++----------------
src/PVE/VZDump/LXC.pm | 57 +++++++++++++++++++++++++--------------------------
2 files changed, 35 insertions(+), 48 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 6a3489a..1388964 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -624,8 +624,10 @@ sub lock_filename {
return "$lockdir/pve-config-${vmid}.lock";
}
-sub lock_aquire {
- my ($vmid, $timeout) = @_;
+sub lock_container {
+ my ($vmid, $timeout, $code, @param) = @_;
+
+ my $res;
$timeout = 10 if !$timeout;
my $mode = LOCK_EX;
@@ -658,7 +660,7 @@ sub lock_aquire {
print STDERR " OK\n";
}
-
+
$lock_handles->{$$}->{$filename}->{refcount}++;
};
@@ -667,12 +669,9 @@ sub lock_aquire {
if ($err) {
die "can't lock file '$filename' - $err";
}
-}
-sub lock_release {
- my ($vmid) = @_;
-
- my $filename = lock_filename($vmid);
+ eval { $res = &$code(@param) };
+ $err = $@;
if (my $fh = $lock_handles->{$$}->{$filename}->{fh}) {
my $refcount = --$lock_handles->{$$}->{$filename}->{refcount};
@@ -681,17 +680,6 @@ sub lock_release {
close ($fh);
}
}
-}
-
-sub lock_container {
- my ($vmid, $timeout, $code, @param) = @_;
-
- my $res;
-
- lock_aquire($vmid, $timeout);
- eval { $res = &$code(@param) };
- my $err = $@;
- lock_release($vmid);
die $err if $err;
diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 3bd34b6..57dcbe2 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -94,28 +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) = @_;
@@ -156,6 +134,8 @@ sub prepare {
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);
@@ -168,26 +148,21 @@ sub prepare {
# 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
}
- PVE::LXC::lock_release($vmid);
-
if ($mode ne 'suspend') {
# If we perform mount operations, let's unshare the mount namespace
# to not influence the running host.
@@ -198,11 +173,35 @@ 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) = @_;
+
+ 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_container($vmid, 60, $unlockconfig, ($self, $vmid));
}
--
2.1.4
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
