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

fix defect 2880329 and change so that nodes output is returned on per node finish basis and not after all nodes are finished. That is nolonger uses the api interface

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4521 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2009-11-09 19:08:40 +00:00
parent a55f492d3e
commit 8ec5423abe
1 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
perl-xCAT/xCAT/DSHCLI.pm
View File

@ -533,14 +533,31 @@ sub _execute_dsh
. join("", @{$error_buffers{$user_target}});
if ($$options{'display_output'})
{
print STDOUT @{$output_buffers{$user_target}};
print STDERR @{$error_buffers{$user_target}};
# print STDOUT @{$output_buffers{$user_target}};
# print STDERR @{$error_buffers{$user_target}};
chomp (@{$output_buffers{$user_target}});
chomp (@{$error_buffers{$user_target}});
my $rsp = {};
push @{$rsp->{data}},@{$output_buffers{$user_target}};
xCAT::MsgUtils->message("D", $rsp,$::CALLBACK);
$rsp = {};
push @{$rsp->{data}},@{$error_buffers{$user_target}};
xCAT::MsgUtils->message("D", $rsp,$::CALLBACK);
}
}
else
{
print STDOUT @{$output_buffers{$user_target}};
print STDERR @{$error_buffers{$user_target}};
#print STDOUT @{$output_buffers{$user_target}};
#print STDERR @{$error_buffers{$user_target}};
chomp (@{$output_buffers{$user_target}});
chomp (@{$error_buffers{$user_target}});
my $rsp = {};
push @{$rsp->{data}},@{$output_buffers{$user_target}};
xCAT::MsgUtils->message("D", $rsp,$::CALLBACK);
$rsp = {};
push @{$rsp->{data}},@{$error_buffers{$user_target}};
xCAT::MsgUtils->message("D", $rsp,$::CALLBACK);
}
}
@ -554,9 +571,9 @@ sub _execute_dsh
if ($exit_code != 0)
{
$rsp->{data}->[0] =
" $user_target remote Command return code = $exit_code.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
#$rsp->{data}->[0] =
# " $user_target remote Command return code = $exit_code.";
#xCAT::MsgUtils->message("I", $rsp, $::CALLBACK, 1);
$rsp->{data}->[0] = "dsh> Remote_command_failed $user_target";
$$options{'monitor'}
@ -575,10 +592,7 @@ sub _execute_dsh
{
if ($target_rc != 0)
{
$rsp->{data}->[0] =
" $user_target remote Command return code = $$target_properties{'target-rc'}.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
$rsp->{data}->[0] =
"dsh> Remote_command_failed $user_target";
@ -3784,13 +3798,21 @@ sub parse_and_run_dsh
#
# Execute the dsh api
@results = xCAT::DSHCLI->runDsh_api(\%options, 0);
if ($::RUNCMD_RC)
{ # error from dsh
$rsp->{data}->[0] = "Error from xdsh. Return Code = $::RUNCMD_RC";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
#@results = xCAT::DSHCLI->runDsh_api(\%options, 0);
#if ($::RUNCMD_RC)
#{ # error from dsh
# $rsp->{data}->[0] = "Error from xdsh. Return Code = $::RUNCMD_RC";
# xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
}
#}
# Execute the dsh command
xCAT::DSHCLI->execute_dsh(\%options);
#if ($::RUNCMD_RC)
#{ # error from dsh
# $rsp->{data}->[0] = "Error from xdsh. Return Code = $::RUNCMD_RC";
# xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
#}
}
return (@results);
}