xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

load Sys::Hostname module with use intead of require to avoid performance decrease; refine the warning message;remove some commented out lines

Browse Source
This commit is contained in:
immarvin 2017-07-23 23:26:03 -04:00
parent 725444cdd1
commit 8b31e63287
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/sbin/xcatd
View File

@ -42,6 +42,7 @@ if ($^O =~ /^aix/i) {
}
use lib "$::XCATROOT/lib/perl";
use Storable qw(freeze thaw nstore_fd store_fd fd_retrieve);
use Sys::Hostname;
use xCAT::Utils;
use xCAT::TableUtils;
use xCAT::NetworkUtils;
@ -2811,18 +2812,15 @@ sub service_connection {
if($req->{'_xcatver'} and $req->{'_xcatver'}->[0]){
my $myxcatver=xCAT::Version->Version();
if($req->{'_xcatver'}->[0] ne $myxcatver){
require Sys::Hostname;
my $myhostname=Sys::Hostname::hostname;
my $resp = { warning => ["$myhostname: my xCAT version \"$myxcatver\" does not match the forwarder's xCAT version \"$req->{'_xcatver'}->[0]\" on $peerhost"]};
my $resp = { warning => ["xCAT Version mismatch! \"$myxcatver\" on $myhostname does not match \"$req->{'_xcatver'}->[0]\" on $peerhost!"]};
$resp->{serverdone} = [undef];
send_response($resp, $sock);
#return;
}
}
# we have a full request..
#printf $request."\n";
$request = "";
if (xCAT::xcatd->validate($peername, $peerhost, $req, $peerhostorg, \@deferredmsgargs)) {
$req->{'_xcat_authname'} = [$peername];