xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-23 14:35:38 +00:00
Code Issues Releases Wiki Activity

fix issue 2051, update noderange check

Browse Source
This commit is contained in:
XuWei
2016-10-30 22:17:00 -04:00
parent ed4e645558
commit 6c8e7befd0
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
xCAT-probe/subcmds/discovery
View File

@ -170,14 +170,14 @@ sub check_pre_defined_node {
@cmdoutput = `lsdef $noderange 2>&1`;
foreach (@cmdoutput) {
if ($_ =~ /^Error: Could not find an object named '(\w+)' .+/i) {
if ($_ =~ /^Error: Could not find an object named '(.+)' of type .+/i) {
$currentnode = $1;
push @errornodes, $currentnode;
$rst = 1;
} elsif ($_ =~ /^\s*Object name: (\w+)/i) {
$currentnode = $1;
$monitor_nodes{$1} = 0;
} elsif ($_ =~ /^\s+(\w+)\s*=\s*(\w+)/) {
} elsif ($_ =~ /^\s+(\w+)\s*=\s*(.*)/) {
$nodecheckrst{$currentnode}{$1} = $2;
}
}
@ -284,15 +284,24 @@ sub check_pre_defined_node {
}
my %switch_node = ();
my @switchoutput = `tabdump switch`;
foreach my $switch_line (@switchoutput) {
next if ($switch_line =~ /#node,switch,port,vlan,interface,comments,disable/);
chomp ($switch_line);
$switch_line =~ s/"//g;
my @split_switch = split(",", $switch_line);
if (($split_switch[1] ne "") and ($split_switch[2] ne "")) {
my $switchport = "$split_switch[1]*$split_switch[2]";
push @{ $switch_node{$switchport} }, $split_switch[0];
my @switchoutput = `lsdef -t node -i switch,switchport -c 2>&1`;
my $node_s;
my $node_p;
my $switch;
my $port;
foreach (@switchoutput) {
chomp($_);
$_ =~ s/^\s+|\s+$//g;
if ($_ =~ /(\S+):\s+switch=(.*)/i) {
$node_s = $1;
$switch = $2;
} elsif ($_ =~ /(\S+):\s+switchport=(.*)/i) {
$node_p = $1;
$port = $2;
}
if (($node_s eq $node_p) and $switch and $port) {
my $switchport = "$switch*$port";
push @{ $switch_node{$switchport} }, $node_s;
}
}
@ -1283,6 +1292,9 @@ sub handle_http_msg {
if ($log_ref->{msg} =~ /GET\s+(.+)\s+HTTP.+/ or $log_ref->{msg} =~ /HEAD\s+(.+)\s+HTTP.+/) {
my $file = $1;
my $record = "Via HTTP $ip get $file";
if ($file =~ /\/install\//i) {
return;
}
probe_utils->send_msg("stdout", "d", "[$mac] $record") if ($monitor);
push(@{ $node_state_ref->{$mac}{log} }, $log_ref->{msg}) if ($debug);

2
xCAT-probe/subcmds/osdeploy
View File

@ -253,7 +253,7 @@ sub check_noderange {
foreach (@cmdoutput) {
chomp($_);
$_ =~ s/^\s+|\s+$//g;
if ($_ =~ /^Error: Could not find an object named '(\w+)' .+/i) {
if ($_ =~ /^Error: Could not find an object named '(.+)' of type .+/i) {
$rst = 1;
push @$error_ref, "Node $1 without node definition";
} elsif ($_ =~ /(\S+):\s+mac=(.*)/i) {