xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-05 04:27:55 +00:00
Code Issues Releases Wiki Activity

refactor(kea): reuse shared service mapping

Browse Source
This commit is contained in:
Vinícius Ferrão
2026-07-24 02:57:56 -03:00
parent 875a6ef40d
commit 4314c72cd3
2 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
perl-xCAT/xCAT/DHCP/Backend/Kea.pm
+27 -34
View File
@@ -11,12 +11,6 @@ use Text::ParseWords qw/shellwords/;
use xCAT::DHCP::Range;
use xCAT::NetworkUtils;
my %KEA_SERVICE_CANDIDATES = (
'kea-dhcp4' => [ 'kea-dhcp4', 'kea-dhcp4-server' ],
'kea-dhcp6' => [ 'kea-dhcp6', 'kea-dhcp6-server' ],
'kea-dhcp-ddns' => [ 'kea-dhcp-ddns', 'kea-dhcp-ddns-server' ],
'kea-ctrl-agent' => [ 'kea-ctrl-agent' ],
);
my @KEA_ACCOUNT_CANDIDATES = ( 'kea', '_kea' );
sub new {
@@ -1024,36 +1018,35 @@ sub _kea_group {
sub _kea_service {
my ( $self, $service ) = @_;
# Kea service names are package-specific, not strictly distribution-specific.
# Prefer the unit that is actually installed so derivatives, backports, and
# locally rebuilt packages do not need a distro/version decision tree here.
foreach my $candidate ( @{ $KEA_SERVICE_CANDIDATES{$service} || [$service] } ) {
return $candidate if $self->_service_available($candidate);
}
return $service
unless $service =~ /\Akea-(?:dhcp4|dhcp6|dhcp-ddns|ctrl-agent)\z/;
return $service;
}
require xCAT::Utils;
sub _service_available {
my ( $self, $service ) = @_;
my $unit = "$service.service";
foreach my $dir ( @{ $self->{service_unit_dirs} || _systemd_unit_dirs() } ) {
return 1 if -e "$dir/$unit";
}
return 1 if -x "/etc/init.d/$service";
return 0;
}
sub _systemd_unit_dirs {
return [
'/etc/systemd/system',
'/run/systemd/system',
'/usr/lib/systemd/system',
'/lib/systemd/system',
];
# Preserve the backend's established candidate subset while taking the
# candidate order and filesystem resolution from the shared service map.
my $candidate_limit = $service eq 'kea-ctrl-agent' ? 1 : 2;
return xCAT::Utils->servicemap(
$service,
{
candidate_limit => $candidate_limit,
searches => [
{
paths => $self->{service_unit_dirs} || [
'/etc/systemd/system',
'/run/systemd/system',
'/usr/lib/systemd/system',
'/lib/systemd/system',
],
suffix => '.service',
},
{
paths => $self->{service_init_dirs} || ['/etc/init.d'],
executable => 1,
},
],
},
) || $service;
}
sub _kea_socket_dir {
perl-xCAT/xCAT/Utils.pm
+21
View File
@@ -4037,6 +4037,8 @@ sub specialservicemgr {
0: SYSVinit
1: systemd
2: upstart
or a filesystem search specification for candidate-major
service resolution
Returns:
the name of service unit or service daemon
undef on fail
@@ -4088,6 +4090,25 @@ sub servicemap {
"mysql" => [ "mysqld", "mysql", "mariadb" ],
);
if (ref($svcmgrtype) eq 'HASH') {
my @candidates = $svchash{$svcname} ? @{ $svchash{$svcname} } : ($svcname);
my $candidate_limit = $svcmgrtype->{candidate_limit};
if ($candidate_limit && @candidates > $candidate_limit) {
@candidates = @candidates[ 0 .. $candidate_limit - 1 ];
}
foreach my $candidate (@candidates) {
foreach my $search (@{ $svcmgrtype->{searches} || [] }) {
foreach my $searchpath (@{ $search->{paths} || [] }) {
my $candidate_path = $searchpath . "/" . $candidate . ( $search->{suffix} || "" );
return $candidate if $search->{executable} ? -x $candidate_path : -e $candidate_path;
}
}
}
my $not_found;
return $not_found;
}
my $path = undef;
my $postfix = "";
my $retdefault = $svcname;