Merge pull request #5905 from fdefelici/fix/reduce-downloader-verbosity

Fix/reduce downloader verbosity

Author: kantai

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 ### Changed
 
 - When a miner times out waiting for signatures, it will re-propose the same block instead of building a new block ([#5877](https://github.com/stacks-network/stacks-core/pull/5877))
+- Improve tenure downloader trace verbosity applying proper logging level depending on the tenure state ("debug" if unconfirmed, "info" otherwise) ([#5871](https://github.com/stacks-network/stacks-core/issues/5871))
 
 ## [3.1.0.0.7]
 

stackslib/src/net/download/nakamoto/tenure_downloader.rs

@@ -149,6 +149,8 @@ pub struct NakamotoTenureDownloader {
     pub tenure_end_block: Option<NakamotoBlock>,
     /// Tenure blocks
     pub tenure_blocks: Option<Vec<NakamotoBlock>>,
+    /// Whether this tenure is unconfirmed
+    pub is_tenure_unconfirmed: bool,
 }
 
 impl NakamotoTenureDownloader {
@@ -161,6 +163,7 @@ impl NakamotoTenureDownloader {
         naddr: NeighborAddress,
         start_signer_keys: RewardSet,
         end_signer_keys: RewardSet,
+        is_tenure_unconfirmed: bool,
     ) -> Self {
         debug!(
             "Instantiate downloader to {}-{} for tenure {}: {}-{}",
@@ -187,6 +190,7 @@ impl NakamotoTenureDownloader {
             tenure_start_block: None,
             tenure_end_block: None,
             tenure_blocks: None,
+            is_tenure_unconfirmed,
         }
     }
 

stackslib/src/net/download/nakamoto/tenure_downloader_set.rs

@@ -520,6 +520,7 @@ impl NakamotoTenureDownloaderSet {
                 naddr.clone(),
                 start_reward_set.clone(),
                 end_reward_set.clone(),
+                false,
             );
 
             debug!("Request tenure {ch} from neighbor {naddr}");
@@ -671,14 +672,18 @@ impl NakamotoTenureDownloaderSet {
             );
             new_blocks.insert(downloader.tenure_id_consensus_hash.clone(), blocks);
             if downloader.is_done() {
-                info!(
-                    "Downloader for tenure {} is finished",
-                    &downloader.tenure_id_consensus_hash
-                );
-                debug!(
-                    "Downloader for tenure {} finished on {naddr}",
-                    &downloader.tenure_id_consensus_hash,
-                );
+                if downloader.is_tenure_unconfirmed {
+                    debug!(
+                        "Downloader for tenure {} finished on {naddr}",
+                        &downloader.tenure_id_consensus_hash,
+                    );
+                } else {
+                    info!(
+                        "Downloader for tenure {} is finished",
+                        &downloader.tenure_id_consensus_hash
+                    );
+                }
+
                 finished.push(naddr.clone());
                 finished_tenures.push(CompletedTenure::from(downloader));
                 continue;

stackslib/src/net/download/nakamoto/tenure_downloader_unconfirmed.rs

@@ -742,6 +742,7 @@ impl NakamotoUnconfirmedTenureDownloader {
             self.naddr.clone(),
             confirmed_signer_keys.clone(),
             unconfirmed_signer_keys.clone(),
+            true,
         );
 
         Ok(ntd)

stackslib/src/net/tests/download/nakamoto.rs

@@ -292,6 +292,7 @@ fn test_nakamoto_tenure_downloader() {
         naddr,
         reward_set.clone(),
         reward_set,
+        false,
     );
 
     // must be first block