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

change the way of getting node type

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9745 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle 2011-06-07 03:06:15 +00:00
parent ea0fe3acd6
commit 69d99bc898
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/lib/xcat/monitoring/monitorctrl.pm
View File

@ -15,6 +15,7 @@ use xCAT_plugin::notification;
use xCAT_monitoring::montbhandler;
use Sys::Hostname;
use xCAT::GlobalDef;
use xCAT::DBobjUtils;
#the list stores the names of the monitoring plug-in and the file name and module names.
#the names are stored in the "name" column of the monitoring table.
@ -965,9 +966,10 @@ sub getMonHierarchy {
my $row3=$temp_hash3{$node};
my $nodetype=""; #default
if (defined($row3) && ($row3)) {
if ($row3->{nodetype}) { $nodetype=$row3->{nodetype}; }
}
#if (defined($row3) && ($row3)) {
# if ($row3->{nodetype}) { $nodetype=$row3->{nodetype}; }
#}
$nodetype=xCAT::DBobjUtils->getnodetype($node);
my $monserver;
my $monmaster;
@ -1066,9 +1068,10 @@ sub getMonServerWithInfo {
my $tmp3= $tabdata->{$node}->[0];
my $nodetype=""; #default
if (defined($tmp3) && ($tmp3)) {
if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
}
#if (defined($tmp3) && ($tmp3)) {
# if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
#}
$nodetype=xCAT::DBobjUtils->getnodetype($node);
my $pairs=$pPairHash->{$node};
@ -1136,9 +1139,10 @@ sub getMonServer {
my $tmp3=$tabdata3->{$node}->[0];
my $nodetype=""; #default
if (defined($tmp3) && ($tmp3)) {
if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
}
#if (defined($tmp3) && ($tmp3)) {
# if ($tmp3->{nodetype}) { $nodetype=$tmp3->{nodetype}; }
#}
$nodetype=xCAT::DBobjUtils->getnodetype($node);
my $pairs=$pPairHash->{$node};