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

More changes for multiple keys in "deps" table

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1658 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-06-13 15:49:08 +00:00
parent 72ab25422e
commit dc81842370
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -1288,21 +1288,17 @@ sub build_depend {
unless ($mptab) {
return("Cannot open mp table");
}
my @ent = $depstab->getAllNodeAttribs( [qw(node nodedep msdelay cmd)] );
if (!@ent) {
return([\%dp]);
}
foreach my $node (@$noderange) {
my $delay = 0;
my $dep;
my @ent = $depstab->getNodeAttribs($node,[qw(nodedep msdelay cmd)]);
foreach my $h ( @ent ) {
if (( $h->{node} eq $node ) and
( grep(/^@$exargs[0]$/, split /,/, $h->{cmd} ))) {
if (exists($h->{nodedep})) { $dep=$h->{nodedep}; }
if (exists($h->{msdelay})) { $delay=$h->{msdelay}; }
last;
if ( grep(/^@$exargs[0]$/, split /,/, $h->{cmd} )) {
if (exists($h->{nodedep})) { $dep=$h->{nodedep}; }
if (exists($h->{msdelay})) { $delay=$h->{msdelay}; }
last;
}
}
if (!defined($dep)) {
@ -1313,7 +1309,7 @@ sub build_depend {
if ( !grep( /^$n$/, @$noderange )) {
return( "Missing dependency on command-line: $node -> $n" );
} elsif ( $n eq $node ) {
return( "Node dependent on itself: $n -> $node" );
next; # ignore multiple levels
}
$dp{$n}{$node} = $delay;
}