From 6620103638f4810feb1220fa2c15f8bf4f5517bd Mon Sep 17 00:00:00 2001 From: Danny Auble <da@schedmd.com> Date: Fri, 7 Jul 2017 15:29:39 -0600 Subject: [PATCH] Follow on to last commit. Make it so no job that is currently pending will have a time displayed when truncating time. Bug 3940. --- .../accounting_storage/mysql/as_mysql_jobacct_process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c index d9718e19da0..cda15b07017 100644 --- a/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c +++ b/src/plugins/accounting_storage/mysql/as_mysql_jobacct_process.c @@ -613,10 +613,12 @@ static int _cluster_get_jobs(mysql_conn_t *mysql_conn, if (job->start && (job->start < job_cond->usage_start)) job->start = job_cond->usage_start; - if (!job->end || job->end > job_cond->usage_end) + /* Only set an end time if the job started */ + if ((job->start && !job->end) || + (job->end > job_cond->usage_end)) job->end = job_cond->usage_end; - if (!job->start) + if (!job->start && job->end) job->start = job->end; /* -- GitLab