Clean up development logging

Signed-off-by: Vlad Volodkin <vlaad@amazon.com>
awslabs · Aug 22, 2024 · 23f8fdc · 23f8fdc
1 parent 845c431
commit 23f8fdc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/mountpoint-s3/src/mem_limiter.rs b/mountpoint-s3/src/mem_limiter.rs
@@ -2,7 +2,7 @@ use std::sync::{atomic::Ordering, Arc};
 
 use humansize::make_format;
 use metrics::atomics::AtomicU64;
-use tracing::{debug, info};
+use tracing::debug;
 
 use mountpoint_s3_client::ObjectClient;
 
@@ -78,7 +78,7 @@ impl<Client: ObjectClient> MemoryLimiter<Client> {
         available_mem
     }
 
-    pub fn print_total_usage(&self) {
+    pub fn log_total_usage(&self) {
         let formatter = make_format(humansize::BINARY);
         let prefetcher_mem_used = self.prefetcher_mem_used.load(Ordering::SeqCst);
         let prefetcher_mem_reserved = self.prefetcher_mem_reserved.load(Ordering::SeqCst);
@@ -89,7 +89,7 @@ impl<Client: ObjectClient> MemoryLimiter<Client> {
             let effective_client_mem_usage = client_stats.mem_used.max(client_stats.mem_reserved);
             total_usage = total_usage.saturating_add(effective_client_mem_usage);
 
-            info!(
+            debug!(
                 total_usage = formatter(total_usage),
                 client_mem_used = formatter(client_stats.mem_used),
                 client_mem_reserved = formatter(client_stats.mem_reserved),

diff --git a/mountpoint-s3/src/prefetch.rs b/mountpoint-s3/src/prefetch.rs
@@ -50,7 +50,7 @@ use mountpoint_s3_client::ObjectClient;
 use part::PartOperationError;
 use part_stream::RequestTaskConfig;
 use thiserror::Error;
-use tracing::trace;
+use tracing::{debug, trace};
 
 use crate::checksums::{ChecksummedBytes, IntegrityError};
 use crate::data_cache::DataCache;
@@ -333,7 +333,7 @@ where
             if self.try_seek(offset).await? {
                 trace!("seek succeeded");
             } else {
-                trace!(
+                debug!(
                     expected = self.next_sequential_read_offset,
                     actual = offset,
                     "out-of-order read, resetting prefetch"
@@ -419,7 +419,6 @@ where
 
     /// Reset this prefetch request to a new offset, clearing any existing tasks queued.
     fn reset_prefetch_to_offset(&mut self, offset: u64) {
-        tracing::warn!("resetting prefetch");
         self.backpressure_task = None;
         self.backward_seek_window.clear();
         self.sequential_read_start_offset = offset;
@@ -512,7 +511,7 @@ impl<Stream: ObjectPartStream, Client: ObjectClient> PrefetchGetObject<Stream, C
 impl<Stream: ObjectPartStream, Client: ObjectClient> Drop for PrefetchGetObject<Stream, Client> {
     fn drop(&mut self) {
         self.record_contiguous_read_metric();
-        self.mem_limiter.print_total_usage();
+        self.mem_limiter.log_total_usage();
     }
 }
 

diff --git a/mountpoint-s3/src/prefetch/backpressure_controller.rs b/mountpoint-s3/src/prefetch/backpressure_controller.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 use async_channel::{unbounded, Receiver, Sender};
 use humansize::make_format;
 use mountpoint_s3_client::ObjectClient;
-use tracing::trace;
+use tracing::{debug, trace};
 
 use crate::mem_limiter::MemoryLimiter;
 
@@ -174,7 +174,7 @@ impl<Client: ObjectClient> BackpressureController<Client> {
             let to_increase = (new_read_window_size - self.preferred_read_window_size) as u64;
             if to_increase <= self.mem_limiter.available_mem() {
                 let formatter = make_format(humansize::BINARY);
-                tracing::info!(
+                debug!(
                     current_size = formatter(self.preferred_read_window_size),
                     new_size = formatter(new_read_window_size),
                     "scaling up preferred read window"
@@ -194,7 +194,7 @@ impl<Client: ObjectClient> BackpressureController<Client> {
                 align(new_read_window_size, self.read_part_size, false).max(self.min_read_window_size);
 
             let formatter = make_format(humansize::BINARY);
-            tracing::info!(
+            debug!(
                 current_size = formatter(self.preferred_read_window_size),
                 new_size = formatter(new_read_window_size),
                 "scaling down read window"