fixup! job-manager: Add user annotation support

flux-framework · Jul 27, 2020 · e473fd6 · e473fd6
1 parent da103df
commit e473fd6
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/modules/job-manager/annotate.c b/src/modules/job-manager/annotate.c
@@ -103,10 +103,8 @@ int annotations_update (flux_t *h, struct job *job, json_t *annotations)
         if (job->annotations) {
             if (update_annotation_recursive (job,
                                              job->annotations,
-                                             annotations) < 0) {
-                flux_log_error (h, "update_annotation_recursive");
+                                             annotations) < 0)
                 return -1;
-            }
             /* Special case: if user cleared all entries, assume we no
              * longer need annotations object
              *
@@ -148,10 +146,8 @@ void annotate_handle_request (flux_t *h,
         errstr = "guests can only annotate their own jobs";
         goto error;
     }
-    if (annotations_update (ctx->h, job, annotations) < 0) {
-        flux_log_error (h, "%s: annotations_update", __FUNCTION__);
+    if (annotations_update (ctx->h, job, annotations) < 0)
         goto error;
-    }
     if (event_batch_pub_annotations (ctx->event, job) < 0) {
         flux_log_error (h, "%s: event_batch_pub_annotations", __FUNCTION__);
         goto error;