Merge pull request #5869 from garlick/log_noise

broker: reduce log noise

src/broker/groups.c

@@ -81,7 +81,6 @@ struct groups {
     flux_watcher_t *batch_timer;
     uint32_t rank;
     struct idset *self;
-    bool verbose;
     struct idset *torpid; // current list of torpid peers at this broker rank
 };
 
@@ -230,15 +229,6 @@ static void batch_apply (struct groups *g)
         json_array_foreach (a, index, entry) {
             batch_apply_one (g, group, entry);
         }
-        if (g->verbose && g->ctx->rank == 0) {
-            char *s = idset_encode (group->members, IDSET_FLAG_RANGE);
-            flux_log (g->ctx->h,
-                      LOG_DEBUG,
-                      "groups: %s=%s",
-                      name,
-                      s && strlen (s) > 0 ? s : "");
-            free (s);
-        }
         get_respond_all (g, group);
     }
     json_object_clear (g->batch);
@@ -820,7 +810,6 @@ struct groups *groups_create (struct broker *ctx)
     if (!(g = calloc (1, sizeof (*g))))
         return NULL;
     g->ctx = ctx;
-    g->verbose = 1;
     if (!(g->batch = json_object ())
         || !(g->groups = zhashx_new ())) {
         errno = ENOMEM;

src/broker/state_machine.c

@@ -842,6 +842,7 @@ static void broker_online_cb (flux_future_t *f, void *arg)
         quorum_reached = true;
 
     if (strlen (members) > 0
+        && s->state == STATE_QUORUM
         && (quorum_reached || now - last_update > 5)) {
         char *hosts = flux_hostmap_lookup (s->ctx->h, members, NULL);
         flux_log (s->ctx->h, LOG_INFO, "online: %s (ranks %s)", hosts, members);

src/common/libzmqutil/zap.c

@@ -99,8 +99,6 @@ static void zap_cb (flux_reactor_t *r,
     const char *status_text = "No access";
     const char *user_id = "";
     struct cert *cert;
-    const char *name = NULL;
-    int log_level = LOG_ERR;
 
     if ((req = mpart_recv (zap->sock))) {
         if (!mpart_streq (req, 0, "1.0")
@@ -113,16 +111,9 @@ static void zap_cb (flux_reactor_t *r,
             status_code = "200";
             status_text = "OK";
             user_id = pubkey;
-            name = cert_meta_get (cert, "name");
-            log_level = LOG_DEBUG;
         }
-        if (!name)
-            name = "unknown";
-        logger (zap,
-                log_level,
-                "overlay auth cert-name=%s %s",
-                name,
-                status_text);
+        else
+            logger (zap, LOG_ERR, "overlay auth %s", status_text);
 
         if (!(rep = mpart_create ()))
             goto done;

src/modules/job-ingest/worker.c

@@ -139,7 +139,6 @@ static void worker_timeout (flux_reactor_t *r, flux_watcher_t *timer,
                             int revents, void *arg)
 {
     struct worker *w = arg;
-    flux_log (w->h, LOG_DEBUG, "%s: inactivity timeout", w->name);
     worker_stop (w);
 }
 

src/modules/resource/acquire.c

@@ -329,8 +329,6 @@ static void reslog_cb (struct reslog *reslog,
     json_t *resobj;
     const flux_msg_t *msg;
 
-    flux_log (ctx->h, LOG_DEBUG, "%s: %s event posted", __func__, name);
-
     msg = flux_msglist_first (acquire->requests);
     while (msg) {
         struct acquire_request *ar = flux_msg_aux_get (msg, "acquire");

t/t3300-system-basic.t

@@ -31,10 +31,6 @@ test_expect_success 'startctl status works' '
 test_expect_success 'broker overlay shows 2 connected children' '
 	test $(overlay_connected_children) -eq 2
 '
-test_expect_success 'testcert was used to authenticate' '
-	flux dmesg |grep "overlay auth" >auth.log &&
-	grep testcert auth.log
-'
 
 test_expect_success 'overlay status is full' '
 	test "$(flux overlay status --timeout=0 --summary)" = "full"