feat: enable verbose instrument for iter rewind and block I/O (#12672)

risingwavelabs · Oct 8, 2023 · 129ab28 · 129ab28
1 parent e69f513
commit 129ab28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/storage/src/hummock/block_cache.rs b/src/storage/src/hummock/block_cache.rs
@@ -17,6 +17,7 @@ use std::hash::{Hash, Hasher};
 use std::ops::Deref;
 use std::sync::Arc;
 
+use await_tree::InstrumentAwait;
 use futures::Future;
 use risingwave_common::cache::{
     CachePriority, CacheableEntry, LookupResponse, LruCache, LruCacheEventListener,
@@ -99,10 +100,12 @@ impl BlockResponse {
         match self {
             BlockResponse::Block(block_holder) => Ok(block_holder),
             BlockResponse::WaitPendingRequest(receiver) => receiver
+                .verbose_instrument_await("wait_pending_fetch_block")
                 .await
                 .map_err(|recv_error| recv_error.into())
                 .map(BlockHolder::from_cached_block),
             BlockResponse::Miss(join_handle) => join_handle
+                .verbose_instrument_await("fetch_block")
                 .await
                 .unwrap()
                 .map(BlockHolder::from_cached_block),

diff --git a/src/storage/src/hummock/store/version.rs b/src/storage/src/hummock/store/version.rs
@@ -18,6 +18,7 @@ use std::collections::HashSet;
 use std::iter::once;
 use std::sync::Arc;
 
+use await_tree::InstrumentAwait;
 use bytes::Bytes;
 use itertools::Itertools;
 use parking_lot::RwLock;
@@ -924,7 +925,7 @@ impl HummockVersionReader {
         );
         user_iter
             .rewind()
-            .instrument(tracing::trace_span!("rewind"))
+            .verbose_instrument_await("rewind")
             .await?;
         local_stats.found_key = user_iter.is_valid();
         local_stats.sub_iter_count = local_stats.staging_imm_iter_count