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

bug fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@873 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2008-03-24 15:37:53 +00:00
parent 754185352b
commit 6df1ac73c9
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,7 +613,6 @@ sub processNodelistTableChanges {
if (@nodenames ==0) { return 0;}
print "monitorctrl: nodenames=@nodenames\n";
my $hierarchy=getMonServerWithInfo(\@nodenames);
#get all possible ip and hostname for the local host
@ -639,9 +638,11 @@ sub processNodelistTableChanges {
push(@noderange, $nodetemp->[0]);
}
my $cmd;
if ($action eq "a") { $cmd="psh $svname XCATBYPASS=Y monaddnode " . join(',', @noderange); }
else { $cmd="psh $svname XCATBYPASS=Y monrmnode " . join(',', @noderange); }
if ($action eq "a") { $cmd="psh --nonodecheck $svname XCATBYPASS=Y monaddnode " . join(',', @noderange); }
else { $cmd="psh --nonodecheck $svname XCATBYPASS=Y monrmnode " . join(',', @noderange); }
#print "cmd=$cmd\n";
my $result=`$cmd 2>&1`;
#print "result=$result\n";
if ($?) {
xCAT::MsgUtils->message('S', "[mon]:$cmd result=$result\n");
}
@ -1137,14 +1138,18 @@ sub nodeStatMonName {
=cut
#--------------------------------------------------------------------------------
sub addNodes {
my %ret=();
if (!$masterpid) { refreshProductList();}
if (keys(%PRODUCT_LIST) ==0) { return %ret; }
my $p_input=shift;
if ($p_input =~ /xCAT_monitoring::monitorctrl/) {
$p_input=shift;
}
my %ret=();
my @nodenames=@$p_input;
if (@nodenames == 0) { return %ret; }
#print "nodenames=@nodenames\n";
my $isSV=xCAT::Utils->isServiceNode();
my @hostinfo=xCAT::Utils->determinehostname();
@ -1185,8 +1190,9 @@ sub addNodes {
foreach my $nodetemp (@$mon_nodes) {
push(@noderange, $nodetemp->[0]);
}
my $cmd="psh $svname XCATBYPASS=Y monaddnode " . join(',', @noderange);
my $cmd="psh --nonodecheck $svname XCATBYPASS=Y monaddnode " . join(',', @noderange);
my $result=`$cmd 2>&1`;
#print "result=$result\n";
if ($?) {
$ret{$svname}=[1, $result];
}
@ -1210,12 +1216,15 @@ sub addNodes {
=cut
#--------------------------------------------------------------------------------
sub removeNodes {
my %ret=();
if (!$masterpid) { refreshProductList();}
if (keys(%PRODUCT_LIST) ==0) { return %ret; }
my $p_input=shift;
if ($p_input =~ /xCAT_monitoring::monitorctrl/) {
$p_input=shift;
}
my %ret=();
my @nodenames=@$p_input;
if (@nodenames == 0) { return %ret; }
@ -1258,8 +1267,9 @@ sub removeNodes {
foreach my $nodetemp (@$mon_nodes) {
push(@noderange, $nodetemp->[0]);
}
my $cmd="psh $svname XCATBYPASS=Y monrmnode " . join(',', @noderange);
my $cmd="psh --nonodecheck $svname XCATBYPASS=Y monrmnode " . join(',', @noderange);
my $result=`$cmd 2>&1`;
#print "result=$result\n";
if ($?) {
$ret{$svname}=[1, $result];
}