xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-25 00:15:43 +00:00
Code Issues Releases Wiki Activity

modify depending on comments

Browse Source
This commit is contained in:
hu-weihua
2016-08-12 03:46:54 -04:00
parent 463f69e3a4
commit 578fda6663
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
xCAT-probe/subcmds/osdeploy
View File

@@ -210,18 +210,34 @@ sub check_noderange {
$rst = 1;
next;
}
$monitor_nodes{$node}{"rst"} = 0;
my $noerror=1;
my @macs = split(/\|/, $nodecheckrst{$node}{"mac"});
foreach my $mac (@macs) {
#[NOTE] don't support 2 adapters in the same network now. TODO
if ($mac =~ /\!\*NOIP\*/) {
$mac =~ s/\!\*NOIP\*//g;
$macmap{$mac}{"ip"} = "NOIP";
$macmap{$mac}{"node"} = $node;
} else {
$macmap{$mac}{"ip"} = $nodecheckrst{$node}{"ip"};
$macmap{$mac}{"node"} = $node;
if($nodecheckrst{$node}{"ip"}){
$macmap{$mac}{"ip"} = $nodecheckrst{$node}{"ip"};
}else{
my $nodeip = xCAT::NetworkUtils->getipaddr($node);
if($nodeip){
$macmap{$mac}{"ip"} = $nodeip;
}else{
$noerror = 0;
$rst = 1;
probe_utils->send_msg("$output", "f", "$node : can't be resolved to a IP address");
}
}
}
}
$monitor_nodes{$node}{"rst"} = 0 if($noerror);
}
unless (%monitor_nodes) {
@@ -600,8 +616,8 @@ sub dump_history {
last if (!$newloop);
}
# print "------------result---------------\n";
# print Dumper %match_result;
print "------------result---------------\n";
print Dumper %match_result;
my $max_match = 0;
foreach my $key (keys %match_result) {
@@ -820,6 +836,8 @@ sub get_valid_logs {
$filename =~ s/(.+)\.(.+)/$1/g;
my $path_only = dirname("$f");
my @rotatefiles;
#TODO using opendir to refine below code
my @alltargetfiles = `ls -lt $path_only |awk -F" " '/ $filename/ {print \$9}'`;
foreach my $samenamefile (@alltargetfiles) {
chomp($samenamefile);