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

ceph: mon destroy: refactor removal assertions

Browse Source 
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-06-19 13:45:51 +02:00 committed by Thomas Lamprecht
parent ad475e25db
commit 3babcc1d52
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PVE/API2/Ceph/MON.pm
View File

@ -73,6 +73,19 @@ my $assert_mon_prerequisites = sub {
} }
}; };
my $assert_mon_can_remove = sub {
my ($monhash, $monlist, $monid, $mondir) = @_;
if (!(defined($monhash->{"mon.$monid"}) ||
grep { $_->{name} && $_->{name} eq $monid } @$monlist))
{
die "no such monitor id '$monid'\n"
}
die "monitor filesystem '$mondir' does not exist on this node\n" if ! -d $mondir;
die "can't remove last monitor\n" if scalar(@$monlist) <= 1;
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'listmon', name => 'listmon',
path => '', path => '',
@ -306,16 +319,12 @@ __PACKAGE__->register_method ({
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};
my $monhash = PVE::Ceph::Services::get_services_info('mon', $cfg, $rados);
die "no such monitor id '$monid'\n"
if !defined($cfg->{$monsection});
my $ccname = PVE::Ceph::Tools::get_config('ccname'); my $ccname = PVE::Ceph::Tools::get_config('ccname');
my $mondir = "/var/lib/ceph/mon/$ccname-$monid"; my $mondir = "/var/lib/ceph/mon/$ccname-$monid";
-d $mondir || die "monitor filesystem '$mondir' does not exist on this node\n";
die "can't remove last monitor\n" if scalar(@$monlist) <= 1; $assert_mon_can_remove->($monhash, $monlist, $monid, $mondir);
my $worker = sub { my $worker = sub {
my $upid = shift; my $upid = shift;