diff --git a/NEWS b/NEWS index 07fa54c512ca8d235ae65d4afb657548648ed888..ac43872fd0907ce4a64198fd795ebab2a6070498 100644 --- a/NEWS +++ b/NEWS @@ -332,6 +332,9 @@ documents those changes that are of interest to users and admins. -- BLUEGENE - add support for scontrol show blocks. -- Added support for job step time limits. +* Changes in SLURM 2.0.10 +========================= + * Changes in SLURM 2.0.9 ======================== -- When running the mysql plugin natively MUNGE errors are now eliminated @@ -353,6 +356,8 @@ documents those changes that are of interest to users and admins. line. Previously the line could be shortened prematurely. -- BLUEGENE - Fix to make sure we don't erroneously set a connection type to SMALL. + -- Type cast a negative uint64_t to int64_t to avoid confusion when doing + arithmetic with it in accounting dealing with over commit time. * Changes in SLURM 2.0.8 ======================== diff --git a/src/plugins/accounting_storage/mysql/mysql_rollup.c b/src/plugins/accounting_storage/mysql/mysql_rollup.c index 60872d3ff7e04d8e35c795c3631728febfb781a6..1ea391823f5775f595664189a3ad6ce2f7a2e36e 100644 --- a/src/plugins/accounting_storage/mysql/mysql_rollup.c +++ b/src/plugins/accounting_storage/mysql/mysql_rollup.c @@ -833,8 +833,8 @@ extern int mysql_hourly_rollup(mysql_conn_t *mysql_conn, if((int64_t)c_usage->i_cpu < 0) { /* info("got %d %d %d", c_usage->r_cpu, */ /* c_usage->i_cpu, c_usage->o_cpu); */ - c_usage->r_cpu += c_usage->i_cpu; - c_usage->o_cpu -= c_usage->i_cpu; + c_usage->r_cpu += (int64_t)c_usage->i_cpu; + c_usage->o_cpu -= (int64_t)c_usage->i_cpu; c_usage->i_cpu = 0; if((int64_t)c_usage->r_cpu < 0) c_usage->r_cpu = 0;