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

api: osd destroy: pull out cleanup param

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-06-05 10:49:53 +02:00
parent 9b44d03dad
commit 5ebb945c3c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,6 +437,7 @@ __PACKAGE__->register_method ({
PVE::Ceph::Tools::check_ceph_inited(); PVE::Ceph::Tools::check_ceph_inited();
my $osdid = $param->{osdid}; my $osdid = $param->{osdid};
my $cleanup = $param->{cleanup};
my $rados = PVE::RADOS->new(); my $rados = PVE::RADOS->new();
# dies if osdid is unknown # dies if osdid is unknown
@ -505,7 +506,8 @@ __PACKAGE__->register_method ({
PVE::Ceph::Tools::ceph_volume_zap($osdid, $param->{cleanup}); PVE::Ceph::Tools::ceph_volume_zap($osdid, $param->{cleanup});
}; };
warn $@ if $@; warn $@ if $@;
if ($param->{cleanup}) {
if ($cleanup) {
# try to remove pvs, but do not fail if it does not work # try to remove pvs, but do not fail if it does not work
for my $dev (keys %$devices_pvremove) { for my $dev (keys %$devices_pvremove) {
eval { run_command(['/sbin/pvremove', $dev], errfunc => {}) }; eval { run_command(['/sbin/pvremove', $dev], errfunc => {}) };
@ -513,7 +515,7 @@ __PACKAGE__->register_method ({
} }
} else { } else {
my $partitions_to_remove = []; my $partitions_to_remove = [];
if ($param->{cleanup}) { if ($cleanup) {
if (my $mp = PVE::ProcFSTools::parse_proc_mounts()) { if (my $mp = PVE::ProcFSTools::parse_proc_mounts()) {
foreach my $line (@$mp) { foreach my $line (@$mp) {
my ($dev, $path, $fstype) = @$line; my ($dev, $path, $fstype) = @$line;
@ -538,7 +540,7 @@ __PACKAGE__->register_method ({
eval { run_command(['/bin/umount', $mountpoint]); }; eval { run_command(['/bin/umount', $mountpoint]); };
if (my $err = $@) { if (my $err = $@) {
warn $err; warn $err;
} elsif ($param->{cleanup}) { } elsif ($cleanup) {
#be aware of the ceph udev rules which can remount. #be aware of the ceph udev rules which can remount.
foreach my $part (@$partitions_to_remove) { foreach my $part (@$partitions_to_remove) {
$remove_partition->($part); $remove_partition->($part);