arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix problem where group mapping may get stuck under certain circumstances

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12630 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-05-11 14:15:06 +00:00
parent 9861a35e00
commit c7f18f612d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT/xCAT/NodeRange.pm
View File

@ -37,6 +37,7 @@ my %allnodehash;
my @grplist;
my $didgrouplist;
my %allgrphash;
my $allgrphashstamp;
my $retaincache=0;
my $recurselevel=0;
@ -237,7 +238,8 @@ sub expandatom { #TODO: implement table selection as an atom (nodetype.os==rhels
# The atom is not a dynamic node group, is it a static node group???
if(!$isdynamicgrp)
{
unless (scalar %allgrphash) { #build a group membership cache
unless (scalar %allgrphash and (time() < ($allgrphashstamp+5))) { #build a group membership cache
$allgrphashstamp=time();
my $nlent;
foreach $nlent (@allnodeset) {
my @groups=split(/,/,$nlent->{groups});
@ -540,7 +542,7 @@ sub noderange {
$nodelist =xCAT::Table->new('nodelist',-create =>1);
$nodelist->_set_use_cache(0); #TODO: a more proper external solution
@cachedcolumns = ('node','groups');
$nodelist->_build_cache(\@cachedcolumns);
$nodelist->_build_cache(\@cachedcolumns,noincrementref=>1);
$nodelist->_set_use_cache(1); #TODO: a more proper external solution
}
my %nodes = ();
@ -624,9 +626,9 @@ sub noderange {
if ($recurselevel) {
$recurselevel--;
} else {
unless ($retaincache) {
retain_cache(0);
}
#unless ($retaincache) {
# retain_cache(0);
#}
}
return sort (keys %nodes);