Skip to content
Snippets Groups Projects
Commit ef7d4255 authored by Danny Auble's avatar Danny Auble
Browse files

fixes for job displaying

parent 2f886910
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment