Merge pull request #4563 from chu11/job_list_cleanup

job-list: misc cleanup

Author: mergify[bot]

src/modules/job-list/idsync.c

@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: LGPL-3.0
 \************************************************************/
 
-/* idsync.c - code to sync job ids if job-info not yet aware of them */
+/* idsync.c - code to sync job ids if job-list not yet aware of them */
 
 #if HAVE_CONFIG_H
 #include "config.h"

src/modules/job-list/job_state.c

@@ -1282,7 +1282,6 @@ static int journal_submit_event (struct job_state_ctx *jsctx,
                                  struct job *job,
                                  flux_jobid_t id,
                                  int eventlog_seq,
-                                 double timestamp,
                                  json_t *context)
 {
     if (!job) {
@@ -1667,7 +1666,6 @@ static int journal_process_event (struct job_state_ctx *jsctx, json_t *event)
                                   job,
                                   id,
                                   eventlog_seq,
-                                  timestamp,
                                   context) < 0)
             return -1;
     }
@@ -1743,8 +1741,8 @@ static int journal_process_event (struct job_state_ctx *jsctx, json_t *event)
             return -1;
     }
     else if (!strcmp (name, "flux-restart")) {
-        /* Presently, job-info depends on job-manager.events-journal
-         * service.  So if job-manager reloads, job-info must be
+        /* Presently, job-list depends on job-manager.events-journal
+         * service.  So if job-manager reloads, job-list must be
          * reloaded, making the probability of reaching this
          * `flux-restart` path very low.  Code added for completeness
          * and in case dependency removed in the future.

src/modules/job-list/list.c

@@ -260,7 +260,7 @@ int wait_id_valid (struct list_ctx *ctx, struct idsync_data *isd)
         zlistx_detach (ctx->idsync_lookups, handle);
     }
 
-    /* idsync_waits holds lists of ids waiting on, b/c multiplers callers
+    /* idsync_waits holds lists of ids waiting on, b/c multiple callers
      * could wait on same id */
     if (!(list_isd = zhashx_lookup (ctx->idsync_waits, &isd->id))) {
         if (!(list_isd = zlistx_new ())) {
@@ -301,12 +301,12 @@ void check_id_valid_continuation (flux_future_t *f, void *arg)
         goto cleanup;
     }
     else {
-        /* Job ID is legal.  Chance job-info has seen ID since this
+        /* Job ID is legal.  Chance job-list has seen ID since this
          * lookup was done */
         struct job *job;
         if (!(job = zhashx_lookup (ctx->jsctx->index, &isd->id))
             || job->state == FLUX_JOB_STATE_NEW) {
-            /* Must wait for job-info to see state change */
+            /* Must wait for job-list to see state change */
             if (wait_id_valid (ctx, isd) < 0)
                 flux_log_error (ctx->h, "%s: wait_id_valid", __FUNCTION__);
             goto cleanup;
@@ -343,7 +343,7 @@ int check_id_valid (struct list_ctx *ctx,
     char path[256];
     int saved_errno;
 
-    /* Check to see if the ID is legal, job-info may have not yet
+    /* Check to see if the ID is legal, job-list may have not yet
      * seen the ID publication yet */
     if (flux_job_kvs_key (path, sizeof (path), id, NULL) < 0)
         goto error;
@@ -416,7 +416,7 @@ json_t *get_job_by_id (struct list_ctx *ctx,
                 flux_log_error (ctx->h, "%s: idsync_data_create", __FUNCTION__);
                 return NULL;
             }
-            /* Must wait for job-info to see state change */
+            /* Must wait for job-list to see state change */
             if (wait_id_valid (ctx, isd) < 0) {
                 flux_log_error (ctx->h, "%s: wait_id_valid", __FUNCTION__);
                 return NULL;