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

ceph: make create/destroypool API paths async

Browse Source 
in order to get task log entries and easily accessible
task/error logs.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-09-05 14:59:40 +02:00 committed by Wolfgang Bumiller
parent c75f019a55
commit 8c42620460
1 changed files with 76 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/API2/Ceph.pm
View File

@ -1591,7 +1591,7 @@ __PACKAGE__->register_method ({
}, },
}, },
}, },
returns => { type => 'null' }, returns => { type => 'string' },
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -1603,10 +1603,10 @@ __PACKAGE__->register_method ({
if ! -f $pve_ckeyring_path; if ! -f $pve_ckeyring_path;
my $pool = $param->{name}; my $pool = $param->{name};
if ($param->{add_storages}) {
my $rpcenv = PVE::RPCEnvironment::get(); my $rpcenv = PVE::RPCEnvironment::get();
my $user = $rpcenv->get_user(); my $user = $rpcenv->get_user();
if ($param->{add_storages}) {
$rpcenv->check($user, '/storage', ['Datastore.Allocate']); $rpcenv->check($user, '/storage', ['Datastore.Allocate']);
die "pool name contains characters which are illegal for storage naming\n" die "pool name contains characters which are illegal for storage naming\n"
if !PVE::JSONSchema::parse_storage_id($pool); if !PVE::JSONSchema::parse_storage_id($pool);
@ -1615,9 +1615,11 @@ __PACKAGE__->register_method ({
my $pg_num = $param->{pg_num} || 64; my $pg_num = $param->{pg_num} || 64;
my $size = $param->{size} || 3; my $size = $param->{size} || 3;
my $min_size = $param->{min_size} || 2; my $min_size = $param->{min_size} || 2;
my $rados = PVE::RADOS->new();
my $application = $param->{application} // 'rbd'; my $application = $param->{application} // 'rbd';
my $worker = sub {
my $rados = PVE::RADOS->new();
$rados->mon_command({ $rados->mon_command({
prefix => "osd pool create", prefix => "osd pool create",
pool => $pool, pool => $pool,
@ -1672,8 +1674,9 @@ __PACKAGE__->register_method ({
die "adding storages for pool '$pool' failed, check log and add manually!\n" die "adding storages for pool '$pool' failed, check log and add manually!\n"
if $err; if $err;
} }
};
return undef; return $rpcenv->fork_worker('cephcreatepool', $pool, $user, $worker);
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -1828,7 +1831,7 @@ __PACKAGE__->register_method ({
}, },
}, },
}, },
returns => { type => 'null' }, returns => { type => 'string' },
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -1856,6 +1859,7 @@ __PACKAGE__->register_method ({
} }
} }
my $worker = sub {
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({
@ -1880,8 +1884,8 @@ __PACKAGE__->register_method ({
die "failed to remove (some) storages - check log and remove manually!\n" die "failed to remove (some) storages - check log and remove manually!\n"
if $err; if $err;
} }
};
return undef; return $rpcenv->fork_worker('cephdestroypool', $pool, $user, $worker);
}}); }});