proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-14 18:07:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api osd create: followup code cleanup

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-06-06 13:43:32 +02:00
parent 45d45a63cd
commit 970f96fdbb
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/API2/Ceph/OSD.pm
View File

@ -255,15 +255,13 @@ __PACKAGE__->register_method ({
# extract parameter info and fail if a device is set more than once
my $devs = {};
for my $type ( qw(dev db wal) ) {
my $name = $type eq 'dev' ? $type : "${type}_dev";
for my $type ( qw(dev db_dev wal_dev) ) {
next if !$param->{$type};
next if !$param->{$name};
my $type_dev = PVE::Diskmanage::verify_blockdev_path($param->{$name});
my $type_dev = PVE::Diskmanage::verify_blockdev_path($param->{$type});
(my $type_devname = $type_dev) =~ s|/dev/||;
raise_param_exc({ $name => "cannot chose '$type_dev' for more than one type." })
raise_param_exc({ $type => "cannot chose '$type_dev' for more than one type." })
if grep { $_->{name} eq $type_devname } values %$devs;
$devs->{$type} = {
@ -285,7 +283,7 @@ __PACKAGE__->register_method ({
die "device '$dev' is already in use\n" if $disklist->{$devname}->{used};
# test db/wal requirements early
for my $type ( qw(db wal) ) {
for my $type ( qw(db_dev wal_dev) ) {
my $d = $devs->{$type};
next if !$d;
my $name = $d->{name};
@ -391,7 +389,7 @@ __PACKAGE__->register_method ({
my $sizes;
foreach my $type ( qw(db wal) ) {
my $fallback_size = $size_map->{$type};
my $d = $devs->{$type};
my $d = $devs->{"${type}_dev"};
next if !$d;
# size was not set via api, getting from config/fallback