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

added the checking of path for runimage, if cannot download, display an error message for nodeset command

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16594 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2013-06-09 09:15:57 +00:00
parent 8ffc45d9cb
commit 73e90f6cd9
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@ -90,6 +90,10 @@ sub setdestiny {
$chaintab = xCAT::Table->new('chain',-create=>1);
my @nodes=@{$req->{node}};
my $state = $req->{arg}->[0];
my $reststates;
# to support the case that the state could be runimage=xxx,runimage=yyy,osimage=xxx
($state, $reststates) = split (/,/, $state, 2);
my %nstates;
if ($state eq "enact") {
my $nodetypetab = xCAT::Table->new('nodetype',-create=>1);
@ -410,6 +414,35 @@ sub setdestiny {
kcmdline => $kcmdline."xcatd=$master:$xcatdport"});
}
}
# try to check the existence of the image for runimage
my @runimgcmds;
if ($state =~ /^runimage/) {
push @runimgcmds, $state;
}
if ($reststates) {
my @rstates = split (/,/, $reststates);
foreach (@rstates) {
if (/^runimage/) {
push @runimgcmds, $_;
}
}
}
foreach (@runimgcmds) {
my (undef, $path) = split (/=/, $_);
if ($path) {
if ($path =~ /\$/) {next;} # Ignore the path with including variable like $xcatmaster
my $cmd = "wget --spider --timeout 3 --tries=1 $path";
my @output = xCAT::Utils->runcmd("$cmd", -1);
unless (grep /^Remote file exists/, @output) {
$callback->({error=>["Cannot get $path with wget. Could you confirm it's downloadable by wget?"],errorcode=>[1]});
return;
}
} else {
$callback->({error=>"An image path should be specified to runnimage.",errorcode=>[1]});
return;
}
}
} elsif ($state eq "offline") {
1;
} elsif (!($state eq "boot")) {
@ -463,6 +496,11 @@ sub setdestiny {
$lstate = $nstates{$_};
}
$chaintab->setNodeAttribs($_,{currstate=>$lstate});
# if there are multiple actions in the state argument, set the rest of states (shift out the first one)
# to chain.currchain so that the rest ones could be used by nextdestiny command
if ($reststates) {
$chaintab->setNodeAttribs($_,{currchain=>$reststates});
}
}
return getdestiny($flag + 1);
}