xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

Revert "Fix issue that site.master is not set"

Browse Source
This commit is contained in:
zet809
2019-03-22 18:18:12 +08:00
committed by GitHub
parent b5ea765d1b
commit e960063253
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
perl-xCAT/xCAT/ServiceNodeUtils.pm
View File

@@ -555,10 +555,6 @@ sub get_ServiceNode
{
push @{ $snhash{$master} }, $node;
}
else
{
xCAT::MsgUtils->message('SW', "Unknown master for node: $node, neither noderes.servicenode nor site.master is set\n");
}
}
}

4
xCAT-server/sbin/xcatd
View File

@@ -2286,10 +2286,6 @@ sub dispatch_request {
$SIG{CHLD} = 'DEFAULT';
xCAT::MsgUtils->trace(0, "D", "xcatd: handle request '$req->{command}->[0]' by plugin '$modname''s preprocess_request");
$reqs = ${ "xCAT_plugin::" . $modname . "::" }{preprocess_request}->($req, $dispatch_cb, \&do_request);
if (not(scalar @$reqs) and not(defined xCAT::TableUtils->get_site_attribute('master'))) {
$dispatch_cb->({ warning => ["The 'master' attribute is not set in the site table and may cause unexpected behavior."]});
return;
}
} else { # otherwise, pass it in without hierarchy support
$reqs = [$req];
}