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

Remove trailing spaces in file xCAT-server/lib/xcat/plugins/destiny.pm

Browse Source
This commit is contained in:
GONG Jie
2017-12-31 23:59:59 +00:00
parent 04f6e3b344
commit 168b501c56
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@ -101,7 +101,7 @@ sub process_request {
sub relay_response {
my $resp = shift;
return unless ($resp);
return unless ($resp);
$callback->($resp);
if ($resp and ($resp->{errorcode} and $resp->{errorcode}->[0]) or ($resp->{error} and $resp->{error}->[0])) {
@ -148,7 +148,7 @@ sub setdestiny {
if (@{ $req->{node} } == 0) {
xCAT::MsgUtils->trace($verbose, "d", "destiny->setdestiny: no nodes left to process, we are done");
return;
return;
}
my @nodes = @{ $req->{node} };
my $bptab = xCAT::Table->new('bootparams', -create => 1);
@ -261,7 +261,7 @@ sub setdestiny {
$callback->({ error => "invalid argument: \"$rawstate\"", errorcode => [1] });
return;
}
if ($target =~ /:/) {
($target, $action) = split ':', $target, 2;
}
@ -286,7 +286,7 @@ sub setdestiny {
if ($state ne 'osimage') {
$callback->({ error => "The options \"install\", \"netboot\", and \"statelite\" have been deprecated, use \"osimage=<osimage_name>\" instead.", errorcode => [1], errorabort => [1] });
return;
return;
my $updateattribs;
if ($target) {
@ -298,7 +298,7 @@ sub setdestiny {
my $nodearch = $2;
foreach (@{ $req->{node} }) {
if ($archentries->{$_}->[0]->{supportedarchs} and $archentries->{$_}->[0]->{supportedarchs} !~ /(^|,)$nodearch(\z|,)/) {
xCAT::MsgUtils->report_node_error($callback, $_,
xCAT::MsgUtils->report_node_error($callback, $_,
"Requested architecture " . $nodearch . " is not one of the architectures supported by $_ (per nodetype.supportedarchs, it supports " . $archentries->{$_}->[0]->{supportedarchs} . ")"
);
$failurenodes{$_} = 1;
@ -549,7 +549,7 @@ sub setdestiny {
}
if ($ntent and $ntent->{arch}) {
$nstates{$_} .= "-" . $ntent->{arch};
} else {
} else {
xCAT::MsgUtils->report_node_error($callback, $_, "nodetype.arch not defined for $_.");
$failurenodes{$_} = 1;
next;
@ -648,15 +648,15 @@ sub setdestiny {
if ($ent and $ent->{xcatmaster}) {
$master = $ent->{xcatmaster};
}
#if node.xcatmaster not specified, take the ip address facing the node
unless($master){
my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($_);
unless ($nxtsrvd[0]) {
$master = $nxtsrvd[1];
unless ($nxtsrvd[0]) {
$master = $nxtsrvd[1];
}
}
#the site.master takes the last precedence
unless($master){
if (defined($master_entry)) {
@ -929,12 +929,12 @@ sub getdestiny {
if ($stat) {
if (exists($node_status{$stat})) {
push @{ $node_status{$stat} }, $node;
} else {
} else {
$node_status{$stat} = [$node];
}
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%node_status, 1);
}
$callback->({ node => [ { name => [$node], data => ['standby'], destiny => ['standby'] } ] });
return;
}