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

fix monitoring code for db2

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8058 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2010-11-05 12:56:56 +00:00
parent e0097ef947
commit 12f059db66
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,7 +579,7 @@ sub getNodeStatusFromNodesetState {
=cut
#--------------------------------------------------------------------------------
sub setNodeStatusAttributes {
#print "monitorctrl::setNodeStatusAttributes called\n";
print "monitorctrl::setNodeStatusAttributes called\n";
my $temp=shift;
if ($temp =~ /xCAT_monitoring::monitorctrl/) {
$temp=shift;
@ -637,15 +637,12 @@ sub setNodeStatusAttributes {
$updates{'status'} = $_;
$updates{'statustime'} = $currtime;
my $where_clause;
my $DBname = xCAT::Utils->get_DBName;
if ($DBname =~ /^DB2/) {
foreach my $nd (@$nodes) {
$where_clause .= "\"node\" LIKE \'$nd\' OR"
}
$where_clause =~ s/OR$//;
my $dbname=xCAT::Utils->get_DBName() ;
if ($dbname eq 'DB2') {
$where_clause="\"node\" in ('" . join("','", @$nodes) . "')";
} else {
$where_clause="node in ('" . join("','", @$nodes) . "')";
}
$where_clause="node in ('" . join("','", @$nodes) . "')";
}
$tab->setAttribsWhere($where_clause, \%updates );
}
}
@ -783,7 +780,15 @@ sub getPluginSettings {
#get the monitoring plug-in list from the monitoring table
my $table=xCAT::Table->new("monsetting", -create =>1);
if ($table) {
my @tmp1=$table->getAllAttribsWhere("name in (\'$name\')", 'key','value');
my $where_clause;
my $dbname=xCAT::Utils->get_DBName() ;
if ($dbname eq 'DB2') {
$where_clause="\"name\" in (\'$name\')";
} else {
$where_clause="name in (\'$name\')";
}
my @tmp1=$table->getAllAttribsWhere($where_clause, 'key','value');
if (@tmp1 > 0) {
foreach(@tmp1) {
if ($_->{key}) {