arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Have xcatd send client more similar content between xml and non xml

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16991 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2013-07-17 15:20:49 +00:00
parent f468d1a5d3
commit 1f6177a5c6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/sbin/xcatd
View File

@ -1209,8 +1209,8 @@ sub plugin_command {
xCAT::NodeRange::retain_cache(0); #if the request has a 'noderange' element, take the performance hit for the sake of freshness
@nodes = noderange($req->{noderange}->[0]);
if (nodesmissed) {
my $rsp = {errorcode=>1,error=>"Invalid nodes and/or groups in noderange: ".join(',',nodesmissed)};
$rsp->{serverdone} = {};
my $rsp = {errorcode=>['1'],error=>["Invalid nodes and/or groups in noderange: ".join(',',nodesmissed)]};
$rsp->{serverdone} = [ undef ];
if ($sock) {
send_response($rsp,$sock);
}
@ -1569,7 +1569,7 @@ sub plugin_command {
$SIG{CHLD} = $old_sig_chld;
my %done;
$done{serverdone} = {};
$done{serverdone} = [ undef ];
if ($req->{transid}) {
$done{transid}=$req->{transid}->[0];
}
@ -1841,7 +1841,7 @@ sub do_request {
if (nodesmissed) {
$resp{warning}="Invalid nodes in noderange:".join ',',nodesmissed;
}
$resp{serverdone} = {};
$resp{serverdone} = [ undef ];
@{$resp{node}}=@nodes;
if ($req->{transid}) {
$resp{transid}=$req->{transid}->[0];
@ -1853,7 +1853,7 @@ sub do_request {
}
} else {
my %resp=(error=>"Unsupported request");
$resp{serverdone} = {};
$resp{serverdone} = [ undef ];
if ($req->{transid}) {
$resp{transid}=$req->{transid}->[0];
}
@ -2071,7 +2071,7 @@ sub service_connection {
$req->{becomeuser}->[0]->{password}->[0]);
unless (defined $peername) {
my $resp={error=>["Authentication failure"],errorcode=>[1]};
$resp->{serverdone}={};
$resp->{serverdone}=[ undef ] ;
send_response($resp,$sock);
return;
}
@ -2102,7 +2102,7 @@ sub service_connection {
} else {
$resp->{data}=["Unauthenticated"];
}
$resp->{serverdone}={};
$resp->{serverdone}=[ undef ];
send_response($resp,$sock);
} elsif ($cmd_handlers{$req->{command}->[0]}) {
plugin_command($req,$sock,\&convey_response);
@ -2113,7 +2113,7 @@ sub service_connection {
if (nodesmissed) {
$resp{warning}="Invalid nodes in noderange:".join ',',nodesmissed;
}
$resp{serverdone} = {};
$resp{serverdone} = [ undef ];
@{$resp{node}}=@nodes;
if ($req->{transid}) {
$resp{transid}=$req->{transid}->[0];
@ -2127,12 +2127,12 @@ sub service_connection {
$subgroups=1;
}
my %resp=%{extnoderange($req->{noderange}->[0],{intersectinggroups=>$subgroups})};
$resp{serverdone}={};
$resp{serverdone}=[ undef ];
send_response(\%resp,$sock);
next;
} else {
my %resp=(error=>"Unsupported request");
$resp{serverdone} = {};
$resp{serverdone} = [ undef ];
if ($req->{transid}) {
$resp{transid}=$req->{transid}->[0];
}
@ -2142,7 +2142,7 @@ sub service_connection {
}
} else {
my %resp=(error=>"Permission denied for request");
$resp{serverdone} = {};
$resp{serverdone} = [ undef ];
if ($req->{transid}) {
$resp{transid}=$req->{transid}->[0];
}