From 8ae7d23540deae7b64c9a007ddd2eb42dd85a9e7 Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Mon, 23 May 2016 21:06:27 -0400 Subject: [PATCH] Temp BMC node definition hadn't been removed for switch-based discovery --- xCAT-server/sbin/xcatd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 867383750..6ba83ae57 100644 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -585,13 +585,13 @@ sub do_discovery_process { populate_vpd_hash(); populate_mp_hash(); while (not $quit) { + my $msg = fd_retrieve($broker); if ((time()-$vintage)> 15) { populate_site_hash(); populate_vpd_hash(); populate_mp_hash(); $vintage = time(); } # site table reread every 15 second - my $msg = fd_retrieve($broker); my $data; my $client; my $clientn; @@ -616,7 +616,7 @@ sub do_discovery_process { # xcatrequest xml, so go ahead and decompress it my $bigdata; IO::Uncompress::Gunzip::gunzip(\$data,\$bigdata); - $data = $bigdata + $data = $bigdata; } my $req = eval { XMLin($data, SuppressEmpty=>undef,ForceArray=>1) }; if ($req and $req->{command} and ($req->{command}->[0] eq "findme" and $sport < 1000)) { # only consider priveleged port requests to start with