job-exec: use f58 encoding for jobids in log messages

Problem: The job-exec module logs jobids in their decimal
representation, which aren't easily identifiable as jobids at first
glance and take up more space in most cases.

Log jobids as f58 where possible and appropriate in the job-exec
module through use of the idf58() convenience function.

Author: grondo

src/modules/job-exec/bulk-exec.c

@@ -20,6 +20,7 @@
 
 #include "src/common/libczmqcontainers/czmq_containers.h"
 #include "src/common/libutil/aux.h"
+#include "src/common/libjob/idf58.h"
 #include "bulk-exec.h"
 
 struct exec_cmd {
@@ -491,8 +492,8 @@ void bulk_exec_kill_log_error (flux_future_t *f, flux_jobid_t id)
         if (flux_future_get (cf, NULL) < 0) {
             uint32_t rank = flux_rpc_get_nodeid (cf);
             flux_log_error (h,
-                            "%ju: exec_kill: %s (rank %lu)",
-                            (uintmax_t) id,
+                            "%s: exec_kill: %s (rank %lu)",
+                            idf58 (id),
                             flux_get_hostbyrank (h, rank),
                             (unsigned long)rank);
         }

src/modules/job-exec/exec.c

@@ -458,7 +458,7 @@ static int exec_kill (struct jobinfo *job, int signum)
         f = bulk_exec_kill (exec, signum);
     if (!f) {
         if (errno != ENOENT)
-            flux_log_error (job->h, "%ju: bulk_exec_kill", job->id);
+            flux_log_error (job->h, "%s: bulk_exec_kill", idf58 (job->id));
         return 0;
     }
 
@@ -469,7 +469,9 @@ static int exec_kill (struct jobinfo *job, int signum)
 
     jobinfo_incref (job);
     if (flux_future_then (f, 3., exec_kill_cb, job) < 0) {
-        flux_log_error (job->h, "%ju: exec_kill: flux_future_then", job->id);
+        flux_log_error (job->h,
+                        "%s: exec_kill: flux_future_then",
+                        idf58 (job->id));
         flux_future_destroy (f);
         return -1;
     }

src/modules/job-exec/job-exec.c

@@ -383,8 +383,8 @@ static void kill_timer_cb (flux_reactor_t *r, flux_watcher_t *w,
               idf58 (job->id));
     if (!(f = flux_job_kill (job->h, job->id, SIGKILL))) {
         flux_log_error (job->h,
-                        "flux_job_kill (%ju, SIGKILL)",
-                        job->id);
+                        "flux_job_kill (%s, SIGKILL)",
+                        idf58 (job->id));
         return;
     }
     /* Open loop */
@@ -429,8 +429,8 @@ static void timelimit_cb (flux_reactor_t *r,
     if (jobid_exception (job->h, job->id, job->req, "timeout", 0, 0,
                          "resource allocation expired") < 0)
         flux_log_error (job->h,
-                        "failed to generate timeout exception for %ju",
-                        job->id);
+                        "failed to generate timeout exception for %s",
+                        idf58 (job->id));
     (*job->impl->kill) (job, SIGALRM);
     flux_watcher_stop (w);
     job->exception_in_progress = 1;
@@ -498,8 +498,8 @@ void jobinfo_started (struct jobinfo *job)
     if (h && job->req) {
         if (jobinfo_set_expiration (job) < 0)
             flux_log_error (h,
-                            "failed to set expiration for %ju",
-                            (uintmax_t) job->id);
+                            "failed to set expiration for %s",
+                            idf58 (job->id));
         job->running = 1;
         if (jobinfo_respond (h, job, "start") < 0)
             flux_log_error (h, "jobinfo_started: flux_respond");
@@ -641,8 +641,8 @@ void jobinfo_log_output (struct jobinfo *job,
                                  "rank", buf,
                                  "data", data, len) < 0)
         flux_log_error (job->h,
-                        "eventlog_append failed: %ju: message=%s",
-                        (uintmax_t) job->id,
+                        "eventlog_append failed: %s: message=%s",
+                        idf58 (job->id),
                         data);
 }
 
@@ -1009,8 +1009,8 @@ static void get_rootref_cb (flux_future_t *fprev, void *arg)
                                                   job->userid)))
         flux_log (job->h,
                   LOG_DEBUG,
-                  "checkpoint rootref not found: %ju",
-                  (uintmax_t)job->id);
+                  "checkpoint rootref not found: %s",
+                  idf58 (job->id));
 
     /* if rootref not found, still create namespace */
     if (!(f = ns_create_and_link (h, job, 0)))
@@ -1084,8 +1084,8 @@ static void evlog_err (struct eventlogger *ev, void *arg, int err, json_t *e)
     struct jobinfo *job = arg;
     char *s = json_dumps (e, JSON_COMPACT);
     flux_log_error (job->h,
-                    "eventlog error: job=%ju: entry=%s",
-                    (uintmax_t) job->id,
+                    "eventlog error: %s: entry=%s",
+                    idf58 (job->id),
                     s);
     free (s);
 }
@@ -1151,8 +1151,8 @@ static int job_start (struct job_exec_ctx *ctx, const flux_msg_t *msg)
     job->ev = eventlogger_create (job->h, 0.01, &ev_ops, job);
     if (!job->ev || eventlogger_setns (job->ev, job->ns) < 0) {
         flux_log_error (job->h,
-                        "eventlogger_create/setns for job %ju failed",
-                        (uintmax_t) job->id);
+                        "eventlogger_create/setns for job %s failed",
+                        idf58 (job->id));
         jobinfo_decref (job);
         return -1;
     }