xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 17:46:38 +00:00
Code Issues Releases Wiki Activity

fix issue Switch-based node discovery failed on cumulus switch #4007 (#4022)

Browse Source
This commit is contained in:
yangsong 2017-09-28 01:18:45 -05:00 committed by Bin Xu
parent f93f5e8e2c
commit 55e1dde86f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perl-xCAT/xCAT/MacMap.pm
View File

@ -543,11 +543,19 @@ sub refresh_table {
pipe my $child, my $parent;
$child->autoflush(1);
$parent->autoflush(1);
$children++;
my $cpid = xCAT::Utils->xfork;
unless (defined $cpid) { die "Cannot fork" }
unless (defined $cpid) {
$children--;
close($child);
close($parent);
xCAT::MsgUtils->message("S", "refresh_table: failed to fork refresh_switch process for $entry->{switch},skip...");
next;
}
if ($cpid == 0) {
$SIG{CHLD} = 'DEFAULT';
close($child);
my $runstart = time;
$self->refresh_switch($parent, $community, $entry->{switch});
@ -556,6 +564,7 @@ sub refresh_table {
xCAT::MsgUtils->message("S", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
exit(0);
}
close($parent);
$inputs->add($child);
}
@ -719,7 +728,7 @@ sub refresh_switch {
my $myport;
my @res=xCAT::Utils->runcmd("ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no $switch 'bridge fdb show|grep -i -v permanent|tr A-Z a-z 2>/dev/null' 2>/dev/null",-1);
unless (@res) {
if ($::RUNCMD_RC) {
xCAT::MsgUtils->message("S", "Failed to get mac table with ssh to $switch, fall back to snmp! To obtain mac table with ssh, please make sure the passwordless root ssh to $switch is available");
}else{
foreach (@res){