job-list: initialize queue stats

Problem: Job queue stats are generated in job-list when a job
is submitted into it.  If a job queue never has a job submitted
to it, no job stats exist for the queue.  This isn't what users
would expect, they should expect queue stats to be 0 for the queue.

Solution: Read the flux config and initialize queue stats to 0 for
any queues that have been configured.

Fixes #5688

Author: chu11

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

@@ -107,6 +107,30 @@ static void disconnect_cb (flux_t *h,
     job_stats_disconnect (ctx->jsctx->statsctx, msg);
 }
 
+static void config_reload_cb (flux_t *h,
+                              flux_msg_handler_t *mh,
+                              const flux_msg_t *msg,
+                              void *arg)
+{
+    struct list_ctx *ctx = arg;
+    const flux_conf_t *conf;
+    flux_error_t error;
+    const char *errstr = NULL;
+
+    if (flux_conf_reload_decode (msg, &conf) < 0)
+        goto error;
+    if (job_state_config_reload (ctx->jsctx, conf, &error) < 0) {
+        errstr = error.text;
+        goto error;
+    }
+    if (flux_respond (h, msg, NULL) < 0)
+        flux_log_error (h, "error responding to config-reload request");
+    return;
+error:
+    if (flux_respond_error (h, msg, errno, errstr) < 0)
+        flux_log_error (h, "error responding to config-reload request");
+}
+
 static const struct flux_msg_handler_spec htab[] = {
     { .typemask     = FLUX_MSGTYPE_REQUEST,
       .topic_glob   = "job-list.list",
@@ -148,6 +172,12 @@ static const struct flux_msg_handler_spec htab[] = {
       .cb           = disconnect_cb,
       .rolemask     = FLUX_ROLE_USER,
     },
+    {
+      .typemask     = FLUX_MSGTYPE_REQUEST,
+      .topic_glob   = "job-list.config-reload",
+      .cb           = config_reload_cb,
+      .rolemask     = 0
+    },
     FLUX_MSGHANDLER_TABLE_END,
 };
 

src/modules/job-list/job_state.c

@@ -1798,6 +1798,13 @@ void job_state_destroy (void *data)
     }
 }
 
+int job_state_config_reload (struct job_state_ctx *jsctx,
+                             const flux_conf_t *conf,
+                             flux_error_t *errp)
+{
+    return job_stats_config_reload (jsctx->statsctx, conf, errp);
+}
+
 /*
  * vi:tabstop=4 shiftwidth=4 expandtab
  */

src/modules/job-list/job_state.h

@@ -72,6 +72,10 @@ void job_state_unpause_cb (flux_t *h, flux_msg_handler_t *mh,
 
 int job_state_init_from_kvs (struct job_state_ctx *jsctx);
 
+int job_state_config_reload (struct job_state_ctx *jsctx,
+                             const flux_conf_t *conf,
+                             flux_error_t *errp);
+
 #endif /* ! _FLUX_JOB_LIST_JOB_STATE_H */
 
 /*

src/modules/job-list/stats.c

@@ -423,6 +423,36 @@ static void job_stats_cb (flux_t *h,
         flux_log_error (h, "error responding to job-stats request");
 }
 
+static int config_parse_queues (struct job_stats_ctx *statsctx,
+                                const flux_conf_t *conf,
+                                flux_error_t *errp)
+{
+    json_t *queues;
+
+    if (flux_conf_unpack (conf, NULL, "{s:o}", "queues", &queues) == 0
+        && json_object_size (queues) > 0) {
+        const char *name;
+        json_t *value;
+        json_object_foreach (queues, name, value) {
+            /* setup initial queue stats, so that user gets initial
+             * stats before first job is submitted to the queue */
+            if (!queue_stats_lookup (statsctx, name, true)) {
+                flux_log_error (statsctx->h, "queue_stats_lookup");
+                return -1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int job_stats_config_reload (struct job_stats_ctx *statsctx,
+                             const flux_conf_t *conf,
+                             flux_error_t *errp)
+{
+    return config_parse_queues (statsctx, conf, errp);
+}
+
 static const struct flux_msg_handler_spec htab[] = {
     { .typemask     = FLUX_MSGTYPE_REQUEST,
       .topic_glob   = "job-list.job-stats",
@@ -435,6 +465,7 @@ static const struct flux_msg_handler_spec htab[] = {
 struct job_stats_ctx *job_stats_ctx_create (flux_t *h)
 {
     struct job_stats_ctx *statsctx = NULL;
+    flux_error_t error;
 
     if (!(statsctx = calloc (1, sizeof (*statsctx))))
         return NULL;
@@ -456,6 +487,13 @@ struct job_stats_ctx *job_stats_ctx_create (flux_t *h)
                                                        statsctx)))
         goto error;
 
+    if (config_parse_queues (statsctx,
+                             flux_get_conf (statsctx->h),
+                             &error) < 0) {
+        flux_log (statsctx->h, LOG_ERR, "%s", error.text);
+        goto error;
+    }
+
     return statsctx;
 
 error:

src/modules/job-list/stats.h

@@ -51,6 +51,10 @@ void job_stats_disconnect (struct job_stats_ctx *statsctx,
  */
 int job_stats_watchers (struct job_stats_ctx *statsctx);
 
+int job_stats_config_reload (struct job_stats_ctx *statsctx,
+                             const flux_conf_t *conf,
+                             flux_error_t *errp);
+
 #endif /* ! _FLUX_JOB_LIST_JOB_STATS_H */
 
 // vi: ts=4 sw=4 expandtab