-- Fixed bug in MinCPU and AveCPU calculations in sstat command

NEWS

@@ -24,6 +24,7 @@ documents those changes that are of interest to users and admins.
  -- Removed the non-functional "SystemCPU" and "TotalCPU" reporting fields from
     sstat and updated man page
  -- Correct location of apbasil command on Cray XT systems.
+ -- Fixed bug in MinCPU and AveCPU calculations in sstat command
 
 * Changes in SLURM 2.2.0.pre6
 =============================

src/plugins/accounting_storage/mysql/as_mysql_job.c

@@ -838,12 +838,10 @@ extern int as_mysql_step_complete(mysql_conn_t *mysql_conn,
 		ave_pages /= (double)cpus;
 		ave_cpu = (double)jobacct->tot_cpu;
 		ave_cpu /= (double)cpus;
-		ave_cpu /= (double)100;
 	}
 
 	if(jobacct->min_cpu != NO_VAL) {
 		ave_cpu2 = (double)jobacct->min_cpu;
-		ave_cpu2 /= (double)100;
 	}
 
 	if(!step_ptr->job_ptr->db_index) {

src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c

@@ -655,6 +655,8 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn,
 				continue;
 
 			step = slurmdb_create_step_rec();
+			step->tot_cpu_sec = 0;
+			step->tot_cpu_usec = 0;
 			step->job_ptr = job;
 			if(!job->first_step_ptr)
 				job->first_step_ptr = step;