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

ceph: factor out get/broadcast ceph versions to ceph::services

Browse Source 
which also removes some dead code
(the my $local_last_version variable was never used)

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2020-03-16 13:55:59 +01:00 committed by Thomas Lamprecht
parent 59807d1e3b
commit 0496138e44
3 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/API2/Cluster/Ceph.pm
View File

@ -74,10 +74,8 @@ __PACKAGE__->register_method ({
version => PVE::Cluster::get_node_kv("ceph-version"), version => PVE::Cluster::get_node_kv("ceph-version"),
}; };
if (defined(my $vers = PVE::Cluster::get_node_kv("ceph-versions"))) { if (defined(my $vers = PVE::Ceph::Services::get_ceph_versions())) {
$res->{node} = { $res->{node} = $vers;
map { eval { $_ => decode_json($vers->{$_}) } } keys %$vers
};
} }
for my $type ( qw(mon mgr mds) ) { for my $type ( qw(mon mgr mds) ) {

30
PVE/Ceph/Services.pm
View File

@ -47,6 +47,36 @@ sub broadcast_ceph_services {
} }
} }
sub broadcast_ceph_versions {
my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1);
if ($version) {
# FIXME: remove with 7.0 - for backward compat only
PVE::Cluster::broadcast_node_kv("ceph-version", $version);
my $node_versions = {
version => {
str => $version,
parts => $vers_parts,
},
buildcommit => $buildcommit,
};
PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions));
}
}
sub get_ceph_versions {
my $res;
if (defined(my $vers = PVE::Cluster::get_node_kv("ceph-versions"))) {
$res = {
map { eval { $_ => decode_json($vers->{$_}) } } keys %$vers
};
}
return $res;
}
sub get_cluster_service { sub get_cluster_service {
my ($type) = @_; my ($type) = @_;

19
PVE/Service/pvestatd.pm
View File

@ -465,24 +465,7 @@ sub update_ceph_metadata {
PVE::Ceph::Services::broadcast_ceph_services(); PVE::Ceph::Services::broadcast_ceph_services();
my ($version, $buildcommit, $vers_parts) = PVE::Ceph::Tools::get_local_version(1); PVE::Ceph::Services::broadcast_ceph_versions();
my $local_last_version = PVE::Cluster::get_node_kv('ceph-versions');
if ($version) {
# FIXME: remove with 7.0 - for backward compat only
PVE::Cluster::broadcast_node_kv("ceph-version", $version);
my $node_versions = {
version => {
str => $version,
parts => $vers_parts,
},
buildcommit => $buildcommit,
};
PVE::Cluster::broadcast_node_kv("ceph-versions", encode_json($node_versions));
}
} }
sub update_sdn_status { sub update_sdn_status {