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

refactor(blade): isolate findme decisions

Browse Source
This commit is contained in:
Vinícius Ferrão
2026-08-25 18:36:51 -03:00
parent 07e591424f
commit d6eca6f052
2 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/perl/xCAT/BladeUtils.pm
+56
View File
@@ -0,0 +1,56 @@
package xCAT::BladeUtils;
use strict;
use warnings;
sub findme_request_for_handler {
my ($request) = @_;
return unless ref $request eq 'HASH';
return unless ref $request->{command} eq 'ARRAY';
return unless defined $request->{command}->[0];
return unless $request->{command}->[0] eq 'findme';
return [$request];
}
sub blade_nodes_from_mp {
my @entries = @_;
my %hwtype;
my %ownmpa;
foreach my $entry (@entries) {
next unless ref $entry eq 'HASH' and defined $entry->{node};
$hwtype{ $entry->{node} } =
defined $entry->{nodetype} ? lc( $entry->{nodetype} ) : q{};
$hwtype{ $entry->{node} } =~ s/^\s+|\s+$//gx;
$ownmpa{ $entry->{node} } = $entry->{mpa}
if defined $entry->{mpa};
}
my @blades;
foreach my $entry (@entries) {
next unless ref $entry eq 'HASH';
my $node = $entry->{node};
next unless defined $node;
if ($hwtype{$node} eq 'blade') {
push @blades, $node;
next;
}
next if $hwtype{$node} ne q{};
my $chassis = $ownmpa{$node};
next if not defined $chassis or $chassis eq $node;
my $chassis_type =
defined $hwtype{$chassis} ? $hwtype{$chassis} : q{};
next if $chassis_type ne 'mm'
and $chassis_type ne 'cmm'
and not(
defined $ownmpa{$chassis}
and $ownmpa{$chassis} eq $chassis
);
push @blades, $node;
}
return @blades;
}
1;
xCAT-server/lib/xcat/plugins/blade.pm
+5 -32
View File
@@ -20,6 +20,7 @@ use xCAT::Table;
use Thread qw(yield);
use xCAT::Utils;
use xCAT::TableUtils;
use xCAT::BladeUtils;
use xCAT::NetworkUtils;
use xCAT::ServiceNodeUtils;
use xCAT::PasswordUtils;
@@ -4142,6 +4143,9 @@ sub preprocess_request {
#if ($request->{_xcatdest}) { return [$request]; } #exit if preprocessed
my $findme_request =
xCAT::BladeUtils::findme_request_for_handler($request);
if ($findme_request) { return $findme_request; }
if ($request->{_xcatpreprocessed}->[0] == 1) { return [$request]; }
my $callback = shift;
my @requests;
@@ -4150,7 +4154,6 @@ sub preprocess_request {
my $noderange = $request->{node}; #Should be arrayref
my $command = $request->{command}->[0];
if ($command eq 'findme') { return [$request]; }
my $extrargs = $request->{arg};
my @exargs = ($request->{arg});
if (ref($extrargs)) {
@@ -4364,35 +4367,6 @@ sub verbose_message {
xCAT::MsgUtils->message("I", \%rsp, $CALLBACK);
}
sub blade_nodes_from_mp {
my @entries = @_;
my %hwtype;
my %ownmpa;
foreach my $entry (@entries) {
next unless defined $entry->{node};
$hwtype{ $entry->{node} } = defined $entry->{nodetype} ? lc($entry->{nodetype}) : q{};
$hwtype{ $entry->{node} } =~ s/^\s+|\s+$//gx;
$ownmpa{ $entry->{node} } = $entry->{mpa} if defined $entry->{mpa};
}
my @blades;
foreach my $entry (@entries) {
my $node = $entry->{node};
next unless defined $node;
if ($hwtype{$node} eq 'blade') {
push @blades, $node;
next;
}
next if $hwtype{$node} ne q{};
my $chassis = $ownmpa{$node};
next if not defined $chassis or $chassis eq $node;
next if $hwtype{$chassis} ne 'mm'
and $hwtype{$chassis} ne 'cmm'
and not(defined $ownmpa{$chassis} and $ownmpa{$chassis} eq $chassis);
push @blades, $node;
}
return @blades;
}
sub process_request {
$SIG{INT} = $SIG{TERM} = sub {
foreach (keys %mm_comm_pids) {
@@ -4508,7 +4482,7 @@ sub process_request {
my $mptab = xCAT::Table->new("mp");
unless ($mptab) { return 2; }
my @bladents = $mptab->getAllNodeAttribs([qw(node nodetype mpa)]);
my @blades = blade_nodes_from_mp(@bladents);
my @blades = xCAT::BladeUtils::blade_nodes_from_mp(@bladents);
unless (@blades) { return; }
my %invreq;
@@ -6281,4 +6255,3 @@ sub genhwtree