diff --git a/NEWS b/NEWS index 2041088a2353b5d8181e2f3033429798e53b6412..bf713cfdf49a5b340a401cf725233ea95013ad10 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,7 @@ documents those changes that are of interest to users and admins. allocating cores or sockets. -- Requeue batch job if it's node reboots (used to abort the job). -- Enlarge maximum size of srun's hostlist file. + -- IPMI - Fix first poll to get correct consumed_energy for a step. * Changes in Slurm 2.6.0rc2 =========================== diff --git a/src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c b/src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c index 40b7a6fb8ec6787b204961bd03b3da135c81bff0..f3c0f8eec77a6f165cca8bd5456a7d66ef1fc422 100644 --- a/src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c +++ b/src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c @@ -732,8 +732,8 @@ static int _get_joules_task(uint16_t delta) /* This is just for the step, so take all the pervious consumption out of the mix. */ - local_energy->previous_consumed_energy += adjustment; - start_current_energy = local_energy->previous_consumed_energy; + start_current_energy = + local_energy->consumed_energy + adjustment; local_energy->base_consumed_energy = 0; first = false; }