xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 18:50:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3522 from immarvin/onxcatver

Browse Source 
fix issue#3515: check the version of xCAT between MN and SN while processing the forwarded request
This commit is contained in:
Victor Hu
2017-07-24 16:15:00 -04:00
committed by GitHub
parent 376f1b723d 8b31e63287
commit 994ddcf62a
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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;
@@ -2301,7 +2302,8 @@ sub dispatch_request {
my $errstr;
eval {
undef $_->{'_xcatdest'};
#the xCAT version is included in the request which will be forwarded
$_->{'_xcatver'}=xCAT::Version->Version();
# mainly used by SN to filter out the incorrect module that xcat command came into
$_->{'_modname'} = $modname;
@@ -2803,8 +2805,22 @@ sub service_connection {
delete($req->{tokenid});
}
#for xcat requests forwarded from other nodes, such as MN<-->SN
# compare the version of xCAT which forwarded the request and the
# one which processes the forwarded command
#if the 2 versions are different, a warning message is included in the response
if($req->{'_xcatver'} and $req->{'_xcatver'}->[0]){
my $myxcatver=xCAT::Version->Version();
if($req->{'_xcatver'}->[0] ne $myxcatver){
my $myhostname=Sys::Hostname::hostname;
my $resp = { warning => ["xCAT Version mismatch! \"$myxcatver\" on $myhostname does not match \"$req->{'_xcatver'}->[0]\" on $peerhost!"]};
$resp->{serverdone} = [undef];
send_response($resp, $sock);
}
}
# we have a full request..
#printf $request."\n";
$request = "";
if (xCAT::xcatd->validate($peername, $peerhost, $req, $peerhostorg, \@deferredmsgargs)) {
$req->{'_xcat_authname'} = [$peername];