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

Fix rvitals energy when used on a system without metered or estimated AC draw

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11471 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-02-03 19:22:56 +00:00
parent c97754e772
commit 01ae059b01
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@ -3812,6 +3812,18 @@ sub readenergy_withiem {
}
sub got_ac_energy {
my $sessdata = shift;
if ($sessdata->{abortediem}) {
$sessdata->{abortediem}=0;
# $sessdata->{iemtextdata} = "AC Energy Usage: ";
# if ($sessdata->{abortediemreason}) {
# $sessdata->{iemtextdata} .= $sessdata->{abortediemreason};
# }
# xCAT::SvrUtils::sendmsg($sessdata->{iemtextdata},$callback,$sessdata->{node},%allerrornodes);
$sessdata->{iem}->prep_get_dc_energy();
$sessdata->{iemcallback} = \&got_dc_energy;
process_data_from_iem($sessdata);
return;
}
$sessdata->{iem}->prep_get_precision();
$sessdata->{iemcallback} = \&got_ac_energy_with_precision;
execute_iem_commands($sessdata); #this gets all precision data initialized
@ -3847,11 +3859,19 @@ sub execute_iem_commands {
}
}
sub executed_iem_command {
if (check_rsp_errors(@_)) {
my $rsp = $_[0];
my $sessdata = $_[1];
if ($rsp->{code} == 0xcb) {
$sessdata->{abortediem}=1;
$sessdata->{abortediemreason}="Not Present";
$sessdata->{iemcallback}->($sessdata);
return;
}
if (check_rsp_errors(@_)) { #error while in an IEM transaction, skip to the end
$sessdata->{abortediem}=1;
$sessdata->{iemcallback}->($sessdata);
return;
}
my $rsp = shift;
my $sessdata = shift;
my @returnd = ($rsp->{code},@{$rsp->{data}});
$sessdata->{iem}->handle_next_payload(@returnd);
execute_iem_commands($sessdata);