From 78ef09c36608f7b871d9a88cfce7f9adaccbd711 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 21 Jan 2015 14:51:07 -0800
Subject: [PATCH] improve job array ID logging
This backports some logic already added to v15.08
---
src/slurmctld/job_mgr.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 5afda8734ca..b7959226aa1 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -13875,12 +13875,16 @@ jobid2str(struct job_record *job_ptr, char *buf)
if (buf == NULL)
return "jobid2str: Invalid buf argument";
- if (job_ptr->array_task_id == NO_VAL) {
+ if (job_ptr->array_recs && (job_ptr->array_task_id == NO_VAL)) {
+ sprintf(buf, "JobID=%u_* State=0x%x NodeCnt=%u",
+ job_ptr->job_id, job_ptr->job_state,
+ job_ptr->node_cnt);
+ } else if (job_ptr->array_task_id == NO_VAL) {
sprintf(buf, "JobID=%u State=0x%x NodeCnt=%u",
job_ptr->job_id, job_ptr->job_state,
job_ptr->node_cnt);
} else {
- sprintf(buf, "JobID=%u_%u (%u) State=0x%x NodeCnt=%u",
+ sprintf(buf, "JobID=%u_%u(%u) State=0x%x NodeCnt=%u",
job_ptr->array_job_id, job_ptr->array_task_id,
job_ptr->job_id, job_ptr->job_state,job_ptr->node_cnt);
}
--
GitLab