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

minor bug fix for monitoring plug-in infrastructure

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@263 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2008-01-14 20:31:25 +00:00
parent a67083a316
commit e47683853f
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT-2.0/xCAT/Schema.pm
View File

@ -849,7 +849,7 @@ package xCAT::Schema;
{attr_name => 'name',
tabentry => 'monitoring.name',
access_tabentry => 'monitoring.name=attr:name',
description => 'The module name of the mornitoring plug-in.'},
description => 'The name of the mornitoring plug-in module.'},
{attr_name => 'nodestatmon',
tabentry => 'monitoring.nodestatmon',
access_tabentry => 'monitoring.name=attr:name',

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

@ -131,9 +131,17 @@ sub handleMonSignal {
my @old_products=keys(%PRODUCT_LIST);
my $old_nodestatmon=$NODESTAT_MON_NAME;
#print "old_products=@old_products.\n";
#print "old_nodestatmon=$old_nodestatmon.\n";
#get new cache values, it also loads the newly added modules
refreshProductList();
#my @new_products=keys(%PRODUCT_LIST);
#my $new_nodestatmon=$NODESTAT_MON_NAME;
#print "new_products=@new_products.\n";
#print "new_nodestatmon=$new_nodestatmon.\n";
#check what have changed
my %summary;
foreach (@old_products) { $summary{$_}=-1;}
@ -143,8 +151,10 @@ sub handleMonSignal {
my %ret=();
foreach (keys %summary) {
if ($summary{$_}==-1) { #plug-in deleted
print "got here stop $_.\n";
%ret=stopMonitoring(($_));
} elsif ($summary{$_}==1) { #plug-in added
print "got here start $_.\n";
my %ret1=startMonitoring(($_));
%ret=(%ret, %ret1);
}
@ -169,7 +179,7 @@ sub handleMonSignal {
foreach(keys(%ret)) {
my $retstat=$ret{$_};
print "$_: @$retstat\n";
}
}
}
@ -275,7 +285,7 @@ sub startMonitoring {
my @ret1 = ${$module_name."::"}{start}->($monservers);
$ret{$_}=\@ret1;
} else {
$ret{$_}=[1, "Monitoring plug-in module for $_ cannot be found."];
$ret{$_}=[1, "Monitoring plug-in module $_ is not registered."];
}
}
@ -321,7 +331,7 @@ sub startNodeStatusMonitoring {
}
}
else {
return (1, "The monitoring plug-in module for $pname cannot be found.");
return (1, "The monitoring plug-in module $pname is not registered.");
}
}
else {
@ -373,10 +383,10 @@ sub stopMonitoring {
$ret{$_}=\@ret3;
next;
}
else {
my @a=($file_name, $module_name);
$PRODUCT_LIST{$pname}=\@a;
}
#else {
# my @a=($file_name, $module_name);
# $PRODUCT_LIST{$pname}=\@a;
#}
}
#stop monitoring
my @ret2 = ${$module_name."::"}{stop}->();
@ -422,10 +432,10 @@ sub stopNodeStatusMonitoring {
if ($@) {
return (1, "The file $file_name cannot be located or has compiling errors.\n");
}
else {
my @a=($file_name, $module_name);
$PRODUCT_LIST{$pname}=\@a;
}
#else {
# my @a=($file_name, $module_name);
# $PRODUCT_LIST{$pname}=\@a;
#}
}
my @ret2 = ${$module_name."::"}{stopNodeStatusMon}->();
@ -713,7 +723,7 @@ sub refreshProductList {
#find out the monitoring plugin file and module name for the product
$file_name="$::XCATROOT/lib/perl/xCAT_monitoring/$pname.pm";
$module_name="xCAT_monitoring::" . $pname;
$module_name="xCAT_monitoring::$pname";
#load the module in memory
eval {require($file_name)};
if ($@) {