yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor diskmanagement lock_file calls

Browse Source 
so that we only have one place where we reference the lockfile
and the timeout

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2018-08-08 10:20:08 +02:00
committed by Dietmar Maurer
parent 7058abe29e
commit e39e8ee213
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Disks/Directory.pm
View File

@ -214,7 +214,7 @@ __PACKAGE__->register_method ({
my $mountunitname = "mnt-pve-$name.mount"; my $mountunitname = "mnt-pve-$name.mount";
my $mountunitpath = "/etc/systemd/system/$mountunitname"; my $mountunitpath = "/etc/systemd/system/$mountunitname";
lock_file('/run/lock/pve-diskmanage.lck', undef, sub { PVE::Diskmanage::locked_disk_action(sub {
# create partition # create partition
my $cmd = [$SGDISK, '-n1', '-t1:8300', $dev]; my $cmd = [$SGDISK, '-n1', '-t1:8300', $dev];
print "# ", join(' ', @$cmd), "\n"; print "# ", join(' ', @$cmd), "\n";
@ -279,11 +279,8 @@ __PACKAGE__->register_method ({
PVE::API2::Storage::Config->create($storage_params); PVE::API2::Storage::Config->create($storage_params);
} }
}); });
die $@ if $@;
}; };
return $rpcenv->fork_worker('dircreate', $name, $user, $worker); return $rpcenv->fork_worker('dircreate', $name, $user, $worker);
}}); }});

4
PVE/API2/Disks/LVM.pm
View File

@ -152,7 +152,7 @@ __PACKAGE__->register_method ({
die "device $dev is already in use\n" if PVE::Diskmanage::disk_is_used($dev); die "device $dev is already in use\n" if PVE::Diskmanage::disk_is_used($dev);
my $worker = sub { my $worker = sub {
my $res = lock_file('/run/lock/pve-diskmanage.lck', undef, sub { PVE::Diskmanage::locked_disk_action(sub {
PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name);
if ($param->{add_storage}) { if ($param->{add_storage}) {
@ -168,8 +168,6 @@ __PACKAGE__->register_method ({
PVE::API2::Storage::Config->create($storage_params); PVE::API2::Storage::Config->create($storage_params);
} }
}); });
die $@ if $@;
}; };
return $rpcenv->fork_worker('lvmcreate', $name, $user, $worker); return $rpcenv->fork_worker('lvmcreate', $name, $user, $worker);

4
PVE/API2/Disks/LVMThin.pm
View File

@ -112,7 +112,7 @@ __PACKAGE__->register_method ({
} }
my $worker = sub { my $worker = sub {
lock_file('/run/lock/pve-diskmanage.lck', undef, sub { PVE::Diskmanage::locked_disk_action(sub {
PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name); PVE::Storage::LVMPlugin::lvm_create_volume_group($dev, $name);
# create thinpool with size 100%, let lvm handle the metadata size # create thinpool with size 100%, let lvm handle the metadata size
@ -131,8 +131,6 @@ __PACKAGE__->register_method ({
PVE::API2::Storage::Config->create($storage_params); PVE::API2::Storage::Config->create($storage_params);
} }
}); });
die $@ if $@;
}; };
return $rpcenv->fork_worker('lvmthincreate', $name, $user, $worker); return $rpcenv->fork_worker('lvmthincreate', $name, $user, $worker);

4
PVE/API2/Disks/ZFS.pm
View File

@ -313,7 +313,7 @@ __PACKAGE__->register_method ({
if $numdisks < $mindisks->{$raidlevel}; if $numdisks < $mindisks->{$raidlevel};
my $worker = sub { my $worker = sub {
lock_file('/run/lock/pve-diskmanage.lck', 10, sub { PVE::Diskmanage::locked_disk_action(sub {
# create zpool with desired raidlevel # create zpool with desired raidlevel
my $cmd = [$ZPOOL, 'create', '-o', "ashift=$ashift", $name]; my $cmd = [$ZPOOL, 'create', '-o', "ashift=$ashift", $name];
@ -347,10 +347,8 @@ __PACKAGE__->register_method ({
PVE::API2::Storage::Config->create($storage_params); PVE::API2::Storage::Config->create($storage_params);
} }
}); });
die $@ if $@;
}; };
return $rpcenv->fork_worker('zfscreate', $name, $user, $worker); return $rpcenv->fork_worker('zfscreate', $name, $user, $worker);
}}); }});

7
PVE/Diskmanage.pm
View File

@ -595,4 +595,11 @@ sub get_blockdev {
return $block_dev; return $block_dev;
} }
sub locked_disk_action {
my ($sub) = @_;
my $res = PVE::Tools::lock_file('/run/lock/pve-diskmanage.lck', undef, $sub);
die $@ if $@;
return $res;
}
1; 1;