Merge pull request #4324 from chu11/issue4313_job_list_all

job-list: support new "all" attribute to get all job attributes

Author: mergify[bot]

src/bindings/python/flux/job/list.py

@@ -17,34 +17,6 @@
 from flux.rpc import RPC
 
 
-VALID_ATTRS = [
-    "userid",
-    "urgency",
-    "priority",
-    "t_submit",
-    "t_depend",
-    "t_run",
-    "t_cleanup",
-    "t_inactive",
-    "state",
-    "name",
-    "ntasks",
-    "nnodes",
-    "ranks",
-    "nodelist",
-    "waitstatus",
-    "success",
-    "exception_occurred",
-    "exception_type",
-    "exception_severity",
-    "exception_note",
-    "result",
-    "expiration",
-    "annotations",
-    "dependencies",
-]
-
-
 class JobListRPC(RPC):
     def get_jobs(self):
         return self.get()["jobs"]
@@ -177,7 +149,7 @@ class JobList:
     def __init__(
         self,
         flux_handle,
-        attrs=VALID_ATTRS,
+        attrs=["all"],
         filters=[],
         ids=[],
         user=None,

src/cmd/flux-job.c

@@ -1092,14 +1092,6 @@ int cmd_cancelall (optparse_t *p, int argc, char **argv)
     return 0;
 }
 
-static const char *list_attrs =
-    "[\"userid\",\"urgency\",\"priority\",\"t_submit\",\"state\"," \
-    "\"name\",\"ntasks\",\"nnodes\",\"ranks\",\"nodelist\",\"expiration\"," \
-    "\"success\",\"exception_occurred\",\"exception_severity\"," \
-    "\"exception_type\",\"exception_note\",\"result\",\"waitstatus\","  \
-    "\"t_depend\",\"t_run\",\"t_cleanup\"," \
-    "\"t_inactive\",\"annotations\",\"dependencies\"]";
-
 int cmd_list (optparse_t *p, int argc, char **argv)
 {
     int optindex = optparse_option_index (p);
@@ -1133,7 +1125,7 @@ int cmd_list (optparse_t *p, int argc, char **argv)
     else
         userid = getuid ();
 
-    if (!(f = flux_job_list (h, max_entries, list_attrs, userid, states)))
+    if (!(f = flux_job_list (h, max_entries, "[\"all\"]", userid, states)))
         log_err_exit ("flux_job_list");
     if (flux_rpc_get_unpack (f, "{s:o}", "jobs", &jobs) < 0)
         log_err_exit ("flux_job_list");
@@ -1169,7 +1161,7 @@ int cmd_list_inactive (optparse_t *p, int argc, char **argv)
     if (!(h = flux_open (NULL, 0)))
         log_err_exit ("flux_open");
 
-    if (!(f = flux_job_list_inactive (h, max_entries, since, list_attrs)))
+    if (!(f = flux_job_list_inactive (h, max_entries, since, "[\"all\"]")))
         log_err_exit ("flux_job_list_inactive");
     if (flux_rpc_get_unpack (f, "{s:o}", "jobs", &jobs) < 0)
         log_err_exit ("flux_job_list_inactive");
@@ -1218,7 +1210,7 @@ int cmd_list_ids (optparse_t *p, int argc, char **argv)
     for (i = 0; i < ids_len; i++) {
         flux_jobid_t id = parse_jobid (argv[optindex + i]);
         flux_future_t *f;
-        if (!(f = flux_job_list_id (h, id, list_attrs)))
+        if (!(f = flux_job_list_id (h, id, "[\"all\"]")))
             log_err_exit ("flux_job_list_id");
         if (flux_future_then (f, -1, list_id_continuation, NULL) < 0)
             log_err_exit ("flux_future_then");

src/cmd/flux-pstree.py

@@ -162,10 +162,9 @@ def load_tree(
     #  This may fail if the instance hasn't loaded the job-list module
     #   or if the current user is not owner
     #
-    attrs = flux.job.list.VALID_ATTRS
     try:
         jobs_rpc = JobList(
-            flux.Flux(uri), ids=jobids, filters=filters, attrs=attrs
+            flux.Flux(uri), ids=jobids, filters=filters, attrs=["all"]
         ).fetch_jobs()
         jobs = jobs_rpc.get_jobs()
     except (OSError, FileNotFoundError):

src/modules/job-list/job-list.c

@@ -20,6 +20,22 @@
 #include "list.h"
 #include "idsync.h"
 
+static const char *attrs[] = {
+    "userid", "urgency", "priority", "t_submit",
+    "t_depend", "t_run", "t_cleanup", "t_inactive",
+    "state", "name", "ntasks", "nnodes",
+    "ranks", "nodelist", "success", "exception_occurred",
+    "exception_type", "exception_severity",
+    "exception_note", "result", "expiration",
+    "annotations", "waitstatus", "dependencies",
+    NULL
+};
+
+const char **job_attrs (void)
+{
+    return attrs;
+}
+
 static void stats_cb (flux_t *h, flux_msg_handler_t *mh,
                       const flux_msg_t *msg, void *arg)
 {

src/modules/job-list/job-list.h

@@ -25,6 +25,8 @@ struct list_ctx {
     zhashx_t *idsync_waits;
 };
 
+const char **job_attrs (void);
+
 #endif /* _FLUX_JOB_LIST_H */
 
 /*