Added Admin Comment field to Job Information Table

jitkang · Nov 20, 2023 · 7ba9821 · 7ba9821
1 parent 326c244
commit 7ba9821
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/etc/slurm-mail/templates/job-table.tpl b/etc/slurm-mail/templates/job-table.tpl
@@ -35,6 +35,10 @@
 		<td>Work dir:</td>
 		<td>$WORKDIR</td>
 	</tr>
+	<tr class="jobEnd">
+		<td>Admin Comment:</td>
+		<td>$ADMIN_COMMENT</td>
+	</tr>
 	<tr>
 		<td>Comment:</td>
 		<td>$COMMENT</td>

diff --git a/src/slurmmail/cli.py b/src/slurmmail/cli.py
@@ -184,6 +184,7 @@ def __process_spool_file(
             "WorkDir",
             "Elapsed",
             "ExitCode",
+            "AdminComment",
             "Comment",
             "Cluster",
             "NodeList",
@@ -244,6 +245,7 @@ def __process_spool_file(
                     job = Job(options.datetime_format, job_id)
 
                 job.cluster = sacct_dict["Cluster"]
+                job.admin_comment = sacct_dict["AdminComment"]
                 job.comment = sacct_dict["Comment"]
                 job.cpus = int(sacct_dict["NCPUS"])
                 job.group = sacct_dict["Group"]
@@ -379,6 +381,7 @@ def __process_spool_file(
             ELAPSED=str(timedelta(seconds=job.elapsed)),
             EXIT_STATE=job.state,
             EXIT_CODE=job.exit_code,
+            ADMIN_COMMENT=job.admin_comment,
             COMMENT=job.comment,
             MEMORY=job.requested_mem_str,
             MAX_MEMORY=job.max_rss_str,

diff --git a/src/slurmmail/slurm.py b/src/slurmmail/slurm.py
@@ -87,6 +87,7 @@ def __init__(
 
         self.array_id: Optional[int] = array_id
         self.cluster: Optional[str] = None
+        self.admin_comment: Optional[str] = None
         self.comment: Optional[str] = None
         self.elapsed: Optional[int] = 0
         self.exit_code: Optional[int] = None