From 801f3061a80bdc0076da03f5ce0f86d5b85d12a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Garillot?=
 <4142+huitseeker@users.noreply.github.com>
Date: Mon, 15 Aug 2022 10:04:34 -0400
Subject: [PATCH] fix: Avoid spammy logging on hitting the entwork's
 BoundedExecutor (#763)

We operate an executor with a bound on the concurrent number of messages (see #463, #559, #706).
PR #472 added logging for the bound being hit.

We expect the executors to operate for a long time at this limit (e.g. in recovery situation).
The spammy logging is not usfeful

This removes the logging of the concurrency bound being hit.
Fixes #759
---
 narwhal/network/src/lib.rs     |  2 +-
 narwhal/network/src/primary.rs | 12 ++++--------
 narwhal/network/src/worker.rs  |  7 -------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/narwhal/network/src/lib.rs b/narwhal/network/src/lib.rs
index a91f8a3243a67..bb8f68f124685 100644
--- a/narwhal/network/src/lib.rs
+++ b/narwhal/network/src/lib.rs
@@ -57,4 +57,4 @@ impl<T> std::future::Future for CancelOnDropHandler<T> {
 //
 // The exact number here probably isn't important, the key things is that it should be finite so
 // that we don't create unbounded numbers of tasks.
-pub const MAX_TASK_CONCURRENCY: usize = 200;
+pub const MAX_TASK_CONCURRENCY: usize = 500;
diff --git a/narwhal/network/src/primary.rs b/narwhal/network/src/primary.rs
index 914c8edfe1c67..33b96af05101c 100644
--- a/narwhal/network/src/primary.rs
+++ b/narwhal/network/src/primary.rs
@@ -12,7 +12,6 @@ use rand::{rngs::SmallRng, SeedableRng as _};
 use std::collections::HashMap;
 use tokio::{runtime::Handle, task::JoinHandle};
 use tonic::transport::Channel;
-use tracing::warn;
 use types::{
     BincodeEncodedPayload, PrimaryMessage, PrimaryToPrimaryClient, PrimaryToWorkerClient,
     PrimaryWorkerMessage,
@@ -63,13 +62,10 @@ impl PrimaryNetwork {
     fn update_metrics(&self) {
         if let Some(m) = &self.metrics {
             for (addr, executor) in &self.executors {
-                let available = executor.available_capacity();
-
-                m.set_network_available_tasks(available as i64, Some(addr.to_string()));
-
-                if available == 0 {
-                    warn!("Executor in network:{} and module:{} available tasks is 0 for client address: {}", m.network_type(), m.module_tag(), addr);
-                }
+                m.set_network_available_tasks(
+                    executor.available_capacity() as i64,
+                    Some(addr.to_string()),
+                );
             }
         }
     }
diff --git a/narwhal/network/src/worker.rs b/narwhal/network/src/worker.rs
index d2e62d872fe77..d8169c1327f72 100644
--- a/narwhal/network/src/worker.rs
+++ b/narwhal/network/src/worker.rs
@@ -11,7 +11,6 @@ use rand::{rngs::SmallRng, SeedableRng as _};
 use std::collections::HashMap;
 use tokio::{runtime::Handle, task::JoinHandle};
 use tonic::transport::Channel;
-use tracing::warn;
 use types::{
     BincodeEncodedPayload, WorkerMessage, WorkerPrimaryMessage, WorkerToPrimaryClient,
     WorkerToWorkerClient,
@@ -61,16 +60,10 @@ impl WorkerNetwork {
     fn update_metrics(&self) {
         if let Some(m) = &self.metrics {
             for (addr, executor) in &self.executors {
-                let available = executor.available_capacity();
-
                 m.set_network_available_tasks(
                     executor.available_capacity() as i64,
                     Some(addr.to_string()),
                 );
-
-                if available == 0 {
-                    warn!("Executor in network:{} and module:{} available tasks is 0 for client address: {}", m.network_type(), m.module_tag(), addr);
-                }
             }
         }
     }