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

More efficient when calling getstate for pxe,xnba and yaboot during node deployment or updatenode

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12063 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2012-03-29 20:33:32 +00:00
parent 13f01c5a87
commit 6c81bc84ce
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@ -153,10 +153,22 @@ sub get_nodeset_state
}
my $state = "undefined";
my $tftpdir;
#get boot type (pxe, yaboot or aixinstall) for the node
my $noderestab = xCAT::Table->new('noderes', -create => 0);
my $ent = $noderestab->getNodeAttribs($node, [qw(netboot)]);
my $ent = $noderestab->getNodeAttribs($node, [qw(netboot tftpdir)]);
#get tftpdir from the noderes table, if not defined get it from site talbe
if ($ent && $ent->{tftpdir}) {
$tftpdir=$ent->{tftpdir};
}
if (!$tftpdir) {
if ($::XCATSITEVALS{tftpdir}) {
$tftpdir=$::XCATSITEVALS{tftpdir};
}
}
if ($ent && $ent->{netboot})
{
my $boottype = $ent->{netboot};
@ -165,21 +177,21 @@ sub get_nodeset_state
if ($boottype eq "pxe")
{
require xCAT_plugin::pxe;
my $tmp = xCAT_plugin::pxe::getstate($node);
my $tmp = xCAT_plugin::pxe::getstate($node, $tftpdir);
my @a = split(' ', $tmp);
$state = $a[0];
}
elsif ($boottype eq "xnba")
{
require xCAT_plugin::xnba;
my $tmp = xCAT_plugin::xnba::getstate($node);
my $tmp = xCAT_plugin::xnba::getstate($node, $tftpdir);
my @a = split(' ', $tmp);
$state = $a[0];
}
elsif ($boottype eq "yaboot")
{
require xCAT_plugin::yaboot;
my $tmp = xCAT_plugin::yaboot::getstate($node);
my $tmp = xCAT_plugin::yaboot::getstate($node, $tftpdir);
my @a = split(' ', $tmp);
$state = $a[0];
}