diff --git a/src/common/jobacct_common.c b/src/common/jobacct_common.c index 316123bfa186f973d50a7903473371213adfa465..e3e737c988a5b59c6c5cad65a293aaeb34e8bff0 100644 --- a/src/common/jobacct_common.c +++ b/src/common/jobacct_common.c @@ -240,7 +240,7 @@ extern void pack_jobacct_job_rec(void *object, Buf buffer) pack32(job->tot_cpu_usec, buffer); pack16(job->track_steps, buffer); pack32(job->uid, buffer); - //packstr(job->user, buffer); + packstr(job->user, buffer); pack32(job->user_cpu_sec, buffer); pack32(job->user_cpu_usec, buffer); } @@ -294,7 +294,7 @@ extern int unpack_jobacct_job_rec(void **job, Buf buffer) safe_unpack32(&job_ptr->tot_cpu_usec, buffer); safe_unpack16(&job_ptr->track_steps, buffer); safe_unpack32(&job_ptr->uid, buffer); - //safe_unpackstr_xmalloc(&job_ptr->user, &uint32_tmp, buffer); + safe_unpackstr_xmalloc(&job_ptr->user, &uint32_tmp, buffer); safe_unpack32(&job_ptr->user_cpu_sec, buffer); safe_unpack32(&job_ptr->user_cpu_usec, buffer); diff --git a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c index 359c1926ff760c4f64392121e59e65cb76d4d0a4..ba2781dcdcf342dd0cfba9b0049260f6275f19ea 100644 --- a/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c +++ b/src/plugins/accounting_storage/mysql/mysql_jobacct_process.c @@ -382,7 +382,7 @@ extern List mysql_jobacct_process_get_jobs(mysql_conn_t *mysql_conn, step->state = atoi(step_row[STEP_REQ_STATE]); step->exitcode = atoi(step_row[STEP_REQ_COMP_CODE]); step->ncpus = atoi(step_row[STEP_REQ_CPUS]); - step->start = atoi(step_row[JOB_REQ_START]); + step->start = atoi(step_row[STEP_REQ_START]); step->end = atoi(step_row[STEP_REQ_END]); /* figure this out by start stop */ diff --git a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c index c1ff95fb8f8046343f1c1356f5d1835a9a764ee6..e62cbdf3d4c2a188e472da0f2763ed064b50234f 100644 --- a/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c +++ b/src/plugins/accounting_storage/pgsql/pgsql_jobacct_process.c @@ -382,7 +382,7 @@ extern List pgsql_jobacct_process_get_jobs(PGconn *acct_pgsql_db, step->ncpus = atoi( PQgetvalue(step_result, j, STEP_REQ_CPUS)); step->start = atoi( - PQgetvalue(step_result, j, JOB_REQ_START)); + PQgetvalue(step_result, j, STEP_REQ_START)); step->end = atoi( PQgetvalue(step_result, j, STEP_REQ_ENDTIME)); /* figure this out by start stop */ diff --git a/src/sacct/options.c b/src/sacct/options.c index 330b6254884f992ab2e7481879900a90934ba5c6..8e179a2bbb72ea360045d5ce95257748d73e88af 100644 --- a/src/sacct/options.c +++ b/src/sacct/options.c @@ -1128,6 +1128,7 @@ void do_list(void) /* FIX ME: this should be handled while getting the data, not afterwards. */ + if (params.opt_uid >= 0 && (job->uid != params.opt_uid)) continue; if (params.opt_gid >= 0 && (job->gid != params.opt_gid))