From 21701a67ffaca4bf04da46e2e595e2d0ca1f4ff1 Mon Sep 17 00:00:00 2001
From: Don Lipari <lipari1@llnl.gov>
Date: Wed, 2 Jun 2010 22:47:13 +0000
Subject: [PATCH] Completes the work of revision 20389 - Fixed bug in MinCPU
and AveCPU calculations in sstat command
---
.../accounting_storage/filetxt/accounting_storage_filetxt.c | 2 --
src/plugins/accounting_storage/pgsql/as_pg_job.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
index a8962790e57..2b9fbd89426 100644
--- a/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
+++ b/src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c
@@ -815,12 +815,10 @@ extern int jobacct_storage_p_step_complete(void *db_conn,
ave_pages /= cpus;
ave_cpu = jobacct->tot_cpu;
ave_cpu /= cpus;
- ave_cpu /= 100;
}
if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = jobacct->min_cpu;
- ave_cpu2 /= 100;
}
if (step_ptr->job_ptr->account && step_ptr->job_ptr->account[0])
diff --git a/src/plugins/accounting_storage/pgsql/as_pg_job.c b/src/plugins/accounting_storage/pgsql/as_pg_job.c
index 3d70f3639a2..11e73edfc50 100644
--- a/src/plugins/accounting_storage/pgsql/as_pg_job.c
+++ b/src/plugins/accounting_storage/pgsql/as_pg_job.c
@@ -909,12 +909,10 @@ js_pg_step_complete(pgsql_conn_t *pg_conn,
ave_pages /= (double)cpus;
ave_cpu = (double)jobacct->tot_cpu;
ave_cpu /= (double)cpus;
- ave_cpu /= (double)100;
}
if(jobacct->min_cpu != (uint32_t)NO_VAL) {
ave_cpu2 = (double)jobacct->min_cpu;
- ave_cpu2 /= (double)100;
}
@@ -1806,6 +1804,8 @@ js_pg_get_jobs_cond(pgsql_conn_t *pg_conn, uid_t uid,
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;
--
GitLab