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

fix(NodeRange): add a nofile option that rejects the ^ file operator

Browse Source 
The ^ operator in a noderange names a file, and noderange() reads it.

Add a nofile option. When nofile is set, noderange() does not open the file. It
records that a ^file atom was present, so a caller can fail closed even when the
range also holds plain nodes. file_operator_rejected() reports this.

noderange() also expands site.excludenodes through a nested call. That range is
trusted site data. Expand it without nofile and keep the request's rejection
state across the call. A configured exclusion cannot clear the flag, and a
^file in site.excludenodes cannot set it.

The default behavior does not change. Forward the option through extnoderange().
This commit is contained in:
Vinícius Ferrão
2026-08-18 14:12:12 -03:00
parent 8a47a02762
commit 73a2e73c44
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
perl-xCAT/xCAT/NodeRange.pm
+13 -2
View File
@@ -11,6 +11,7 @@ our @EXPORT = qw(noderange nodesmissed);
our @EXPORT_OK = qw(extnoderange abbreviate_noderange);
my $missingnodes = [];
my $filerejected = 0;
my $nodelist; #=xCAT::Table->new('nodelist',-create =>1);
my $grptab;
@@ -72,6 +73,10 @@ sub nodesmissed {
return @$missingnodes;
}
sub file_operator_rejected {
return $filerejected;
}
sub reset_db {
#workaround, something seems to be trying to use a corrupted reference to grptab
@@ -521,7 +526,7 @@ sub extnoderange { #An extended noderange function. Needed by the GUI as the mo
}
my $return;
$retaincache = 1;
$return->{node} = [ noderange($range, $verify) ];
$return->{node} = [ noderange($range, $verify, 1, nofile => $namedopts->{nofile}) ];
if ($namedopts->{intersectinggroups}) {
my %grouphash = ();
my $nlent;
@@ -626,6 +631,7 @@ sub noderange {
my %options = @_; # additional options
unless ($options{keepmissing}) {
$missingnodes = [];
$filerejected = 0;
}
unless ($nodelist) {
@@ -679,6 +685,7 @@ sub noderange {
if ($atom =~ /^\^(.*)$/) { # get a list of nodes from a file
my $nrfile = $1;
if ($options{nofile}) { $filerejected = 1; next; }
open(my $nrf, '<', $nrfile) or next;
while (<$nrf>) {
my $line = $_;
@@ -724,7 +731,11 @@ sub noderange {
my $badnoderange = 0;
my @badnodes = ();
if ($::XCATSITEVALS{excludenodes}) {
@badnodes = noderange($::XCATSITEVALS{excludenodes}, 1, 0, %options);
my $request_filerejected = $filerejected;
my %exclude_options = %options;
delete $exclude_options{nofile};
@badnodes = noderange($::XCATSITEVALS{excludenodes}, 1, 0, %exclude_options);
$filerejected = $request_filerejected;
foreach my $bnode (@badnodes) {
if (!$delnodes{$bnode}) {
$delnodes{$bnode} = 1;