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

whitespace cleanup

Browse Source 
and intendation fix

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-07-26 11:11:53 +02:00 committed by Wolfgang Bumiller
parent ca68ac3efd
commit be753927e7
1 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
PVE/API2/Ceph.pm
View File

@ -34,7 +34,7 @@ my $get_osd_status = sub {
my $osdstat; my $osdstat;
foreach my $d (@$osdlist) { foreach my $d (@$osdlist) {
$osdstat->{$d->{osd}} = $d if defined($d->{osd}); $osdstat->{$d->{osd}} = $d if defined($d->{osd});
} }
if (defined($osdid)) { if (defined($osdid)) {
die "no such OSD '$osdid'\n" if !$osdstat->{$osdid}; die "no such OSD '$osdid'\n" if !$osdstat->{$osdid};
@ -47,12 +47,12 @@ my $get_osd_status = sub {
my $get_osd_usage = sub { my $get_osd_usage = sub {
my ($rados) = @_; my ($rados) = @_;
my $osdlist = $rados->mon_command({ prefix => 'pg dump', my $osdlist = $rados->mon_command({ prefix => 'pg dump',
dumpcontents => [ 'osds' ]}) || []; dumpcontents => [ 'osds' ]}) || [];
my $osdstat; my $osdstat;
foreach my $d (@$osdlist) { foreach my $d (@$osdlist) {
$osdstat->{$d->{osd}} = $d if defined($d->{osd}); $osdstat->{$d->{osd}} = $d if defined($d->{osd});
} }
return $osdstat; return $osdstat;
@ -69,7 +69,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -96,10 +96,10 @@ __PACKAGE__->register_method ({
my $newnodes = {}; my $newnodes = {};
foreach my $e (@{$res->{nodes}}) { foreach my $e (@{$res->{nodes}}) {
$nodes->{$e->{id}} = $e; $nodes->{$e->{id}} = $e;
my $new = { my $new = {
id => $e->{id}, id => $e->{id},
name => $e->{name}, name => $e->{name},
type => $e->{type} type => $e->{type}
}; };
@ -167,7 +167,7 @@ __PACKAGE__->register_method ({
proxyto => 'node', proxyto => 'node',
protected => 1, protected => 1,
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
dev => { dev => {
@ -226,7 +226,7 @@ __PACKAGE__->register_method ({
die "unable to get device info for '$devname'\n" die "unable to get device info for '$devname'\n"
if !$diskinfo; if !$diskinfo;
die "device '$param->{dev}' is in use\n" die "device '$param->{dev}' is in use\n"
if $diskinfo->{used}; if $diskinfo->{used};
my $devpath = $diskinfo->{devpath}; my $devpath = $diskinfo->{devpath};
@ -243,7 +243,7 @@ __PACKAGE__->register_method ({
my $bindata = $rados->mon_command({ prefix => 'auth get', entity => 'client.bootstrap-osd', format => 'plain' }); my $bindata = $rados->mon_command({ prefix => 'auth get', entity => 'client.bootstrap-osd', format => 'plain' });
PVE::Tools::file_set_contents($ceph_bootstrap_osd_keyring, $bindata); PVE::Tools::file_set_contents($ceph_bootstrap_osd_keyring, $bindata);
}; };
my $worker = sub { my $worker = sub {
my $upid = shift; my $upid = shift;
@ -269,7 +269,7 @@ __PACKAGE__->register_method ({
} else { } else {
push @$cmd, $devpath; push @$cmd, $devpath;
} }
run_command($cmd); run_command($cmd);
}; };
@ -284,7 +284,7 @@ __PACKAGE__->register_method ({
proxyto => 'node', proxyto => 'node',
protected => 1, protected => 1,
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
osdid => { osdid => {
@ -325,7 +325,7 @@ __PACKAGE__->register_method ({
my $upid = shift; my $upid = shift;
# reopen with longer timeout # reopen with longer timeout
$rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout')); $rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout'));
print "destroy OSD $osdsection\n"; print "destroy OSD $osdsection\n";
@ -358,7 +358,7 @@ __PACKAGE__->register_method ({
my $journal_part; my $journal_part;
my $data_part; my $data_part;
if ($param->{cleanup}) { if ($param->{cleanup}) {
my $jpath = "$mountpoint/journal"; my $jpath = "$mountpoint/journal";
$journal_part = abs_path($jpath); $journal_part = abs_path($jpath);
@ -402,7 +402,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
osdid => { osdid => {
@ -441,7 +441,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
osdid => { osdid => {
@ -502,7 +502,7 @@ use Data::Dumper; # fixme: remove
my $pve_osd_default_journal_size = 1024*5; my $pve_osd_default_journal_size = 1024*5;
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
subclass => "PVE::API2::CephOSD", subclass => "PVE::API2::CephOSD",
path => 'osd', path => 'osd',
}); });
@ -516,7 +516,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -561,7 +561,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
type => { type => {
@ -611,7 +611,7 @@ __PACKAGE__->register_method ({
} }
$d->{dev} = "/dev/$dev"; $d->{dev} = "/dev/$dev";
push @$res, $d; push @$res, $d;
} }
return $res; return $res;
@ -626,7 +626,7 @@ __PACKAGE__->register_method ({
}, },
description => "Get Ceph configuration.", description => "Get Ceph configuration.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -653,7 +653,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -699,7 +699,7 @@ __PACKAGE__->register_method ({
my $mons = $monstat->{monmap}->{mons}; my $mons = $monstat->{monmap}->{mons};
foreach my $d (@$mons) { foreach my $d (@$mons) {
next if !defined($d->{name}); next if !defined($d->{name});
$monhash->{$d->{name}}->{rank} = $d->{rank}; $monhash->{$d->{name}}->{rank} = $d->{rank};
$monhash->{$d->{name}}->{addr} = $d->{addr}; $monhash->{$d->{name}}->{addr} = $d->{addr};
if (grep { $_ eq $d->{rank} } @{$monstat->{quorum}}) { if (grep { $_ eq $d->{rank} } @{$monstat->{quorum}}) {
$monhash->{$d->{name}}->{quorum} = 1; $monhash->{$d->{name}}->{quorum} = 1;
@ -722,11 +722,11 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
network => { network => {
description => "Use specific network for all ceph related traffic", description => "Use specific network for all ceph related traffic",
type => 'string', format => 'CIDR', type => 'string', format => 'CIDR',
optional => 1, optional => 1,
maxLength => 128, maxLength => 128,
@ -798,11 +798,11 @@ __PACKAGE__->register_method ({
'mon allow pool delete' => 'true', 'mon allow pool delete' => 'true',
}; };
# this does not work for default pools # this does not work for default pools
#'osd pool default pg num' => $pg_num, #'osd pool default pg num' => $pg_num,
#'osd pool default pgp num' => $pg_num, #'osd pool default pgp num' => $pg_num,
} }
$cfg->{global}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring'; $cfg->{global}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring';
$cfg->{osd}->{keyring} = '/var/lib/ceph/osd/ceph-$id/keyring'; $cfg->{osd}->{keyring} = '/var/lib/ceph/osd/ceph-$id/keyring';
@ -906,7 +906,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
id => { id => {
@ -939,7 +939,7 @@ __PACKAGE__->register_method ({
my $moncount = 0; my $moncount = 0;
my $monaddrhash = {}; my $monaddrhash = {};
my $systemd_managed = PVE::CephTools::systemd_managed(); my $systemd_managed = PVE::CephTools::systemd_managed();
@ -956,7 +956,7 @@ __PACKAGE__->register_method ({
my $monid = $param->{id} // $param->{node}; my $monid = $param->{id} // $param->{node};
my $monsection = "mon.$monid"; my $monsection = "mon.$monid";
my $ip; my $ip;
if (my $pubnet = $cfg->{global}->{'public network'}) { if (my $pubnet = $cfg->{global}->{'public network'}) {
$ip = &$find_node_ip($pubnet); $ip = &$find_node_ip($pubnet);
@ -968,7 +968,7 @@ __PACKAGE__->register_method ({
my $monname = $param->{node}; my $monname = $param->{node};
die "monitor '$monsection' already exists\n" if $cfg->{$monsection}; die "monitor '$monsection' already exists\n" if $cfg->{$monsection};
die "monitor address '$monaddr' already in use by '$monaddrhash->{$monaddr}'\n" die "monitor address '$monaddr' already in use by '$monaddrhash->{$monaddr}'\n"
if $monaddrhash->{$monaddr}; if $monaddrhash->{$monaddr};
my $worker = sub { my $worker = sub {
@ -999,7 +999,7 @@ __PACKAGE__->register_method ({
my $mondir = "/var/lib/ceph/mon/$ccname-$monid"; my $mondir = "/var/lib/ceph/mon/$ccname-$monid";
-d $mondir && die "monitor filesystem '$mondir' already exist\n"; -d $mondir && die "monitor filesystem '$mondir' already exist\n";
my $monmap = "/tmp/monmap"; my $monmap = "/tmp/monmap";
my $rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout')); my $rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout'));
@ -1069,7 +1069,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
monid => { monid => {
@ -1096,15 +1096,15 @@ __PACKAGE__->register_method ({
PVE::CephTools::check_ceph_inited(); PVE::CephTools::check_ceph_inited();
my $cfg = PVE::CephTools::parse_ceph_config(); my $cfg = PVE::CephTools::parse_ceph_config();
my $monid = $param->{monid}; my $monid = $param->{monid};
my $monsection = "mon.$monid"; my $monsection = "mon.$monid";
my $rados = PVE::RADOS->new(); my $rados = PVE::RADOS->new();
my $monstat = $rados->mon_command({ prefix => 'mon_status' }); my $monstat = $rados->mon_command({ prefix => 'mon_status' });
my $monlist = $monstat->{monmap}->{mons}; my $monlist = $monstat->{monmap}->{mons};
die "no such monitor id '$monid'\n" die "no such monitor id '$monid'\n"
if !defined($cfg->{$monsection}); if !defined($cfg->{$monsection});
my $ccname = PVE::CephTools::get_config('ccname'); my $ccname = PVE::CephTools::get_config('ccname');
@ -1118,7 +1118,7 @@ __PACKAGE__->register_method ({
my $upid = shift; my $upid = shift;
# reopen with longer timeout # reopen with longer timeout
$rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout')); $rados = PVE::RADOS->new(timeout => PVE::CephTools::get_config('long_rados_timeout'));
$rados->mon_command({ prefix => "mon remove", name => $monid, format => 'plain' }); $rados->mon_command({ prefix => "mon remove", name => $monid, format => 'plain' });
@ -1237,7 +1237,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
service => { service => {
@ -1287,7 +1287,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
service => { service => {
@ -1337,7 +1337,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -1365,7 +1365,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -1430,7 +1430,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
name => { name => {
@ -1479,7 +1479,7 @@ __PACKAGE__->register_method ({
my $pve_ckeyring_path = PVE::CephTools::get_config('pve_ckeyring_path'); my $pve_ckeyring_path = PVE::CephTools::get_config('pve_ckeyring_path');
die "not fully configured - missing '$pve_ckeyring_path'\n" die "not fully configured - missing '$pve_ckeyring_path'\n"
if ! -f $pve_ckeyring_path; if ! -f $pve_ckeyring_path;
my $pg_num = $param->{pg_num} || 64; my $pg_num = $param->{pg_num} || 64;
@ -1488,7 +1488,7 @@ __PACKAGE__->register_method ({
my $ruleset = $param->{crush_ruleset} || 0; my $ruleset = $param->{crush_ruleset} || 0;
my $rados = PVE::RADOS->new(); my $rados = PVE::RADOS->new();
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool create", prefix => "osd pool create",
pool => $param->{name}, pool => $param->{name},
pg_num => int($pg_num), pg_num => int($pg_num),
@ -1497,7 +1497,7 @@ __PACKAGE__->register_method ({
format => 'plain', format => 'plain',
}); });
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool set", prefix => "osd pool set",
pool => $param->{name}, pool => $param->{name},
var => 'min_size', var => 'min_size',
@ -1505,7 +1505,7 @@ __PACKAGE__->register_method ({
format => 'plain', format => 'plain',
}); });
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool set", prefix => "osd pool set",
pool => $param->{name}, pool => $param->{name},
var => 'size', var => 'size',
@ -1514,7 +1514,7 @@ __PACKAGE__->register_method ({
}); });
if (defined($param->{crush_ruleset})) { if (defined($param->{crush_ruleset})) {
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool set", prefix => "osd pool set",
pool => $param->{name}, pool => $param->{name},
var => 'crush_ruleset', var => 'crush_ruleset',
@ -1657,7 +1657,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Modify' ]], check => ['perm', '/', [ 'Sys.Modify' ]],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
name => { name => {
@ -1696,7 +1696,7 @@ __PACKAGE__->register_method ({
my $rados = PVE::RADOS->new(); my $rados = PVE::RADOS->new();
# fixme: '--yes-i-really-really-mean-it' # fixme: '--yes-i-really-really-mean-it'
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool delete", prefix => "osd pool delete",
pool => $param->{name}, pool => $param->{name},
pool2 => $param->{name}, pool2 => $param->{name},
@ -1719,7 +1719,7 @@ __PACKAGE__->register_method ({
check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1], check => ['perm', '/', [ 'Sys.Audit', 'Datastore.Audit' ], any => 1],
}, },
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
}, },
@ -1739,7 +1739,7 @@ __PACKAGE__->register_method ({
my $mapdata = "/var/tmp/ceph-crush.txt.$$"; my $mapdata = "/var/tmp/ceph-crush.txt.$$";
my $rados = PVE::RADOS->new(); my $rados = PVE::RADOS->new();
eval { eval {
my $bindata = $rados->mon_command({ prefix => 'osd getcrushmap', format => 'plain' }); my $bindata = $rados->mon_command({ prefix => 'osd getcrushmap', format => 'plain' });
PVE::Tools::file_set_contents($mapfile, $bindata); PVE::Tools::file_set_contents($mapfile, $bindata);
@ -1752,13 +1752,13 @@ __PACKAGE__->register_method ({
unlink $mapdata; unlink $mapdata;
die $err if $err; die $err if $err;
return $txt; return $txt;
}}); }});
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'log', name => 'log',
path => 'log', path => 'log',
method => 'GET', method => 'GET',
description => "Read ceph log", description => "Read ceph log",
proxyto => 'node', proxyto => 'node',
@ -1767,7 +1767,7 @@ __PACKAGE__->register_method({
}, },
protected => 1, protected => 1,
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
start => { start => {
@ -1784,7 +1784,7 @@ __PACKAGE__->register_method({
}, },
returns => { returns => {
type => 'array', type => 'array',
items => { items => {
type => "object", type => "object",
properties => { properties => {
n => { n => {
@ -1809,8 +1809,8 @@ __PACKAGE__->register_method({
my ($count, $lines) = PVE::Tools::dump_logfile($logfile, $param->{start}, $param->{limit}); my ($count, $lines) = PVE::Tools::dump_logfile($logfile, $param->{start}, $param->{limit});
$rpcenv->set_result_attrib('total', $count); $rpcenv->set_result_attrib('total', $count);
return $lines; return $lines;
}}); }});