diff --git a/crates/subspace-farmer/src/utils/farmer_piece_getter.rs b/crates/subspace-farmer/src/utils/farmer_piece_getter.rs index b245a43a09..4111f96280 100644 --- a/crates/subspace-farmer/src/utils/farmer_piece_getter.rs +++ b/crates/subspace-farmer/src/utils/farmer_piece_getter.rs @@ -12,7 +12,7 @@ use subspace_networking::utils::multihash::ToMultihash; use subspace_networking::utils::piece_provider::{PieceProvider, PieceValidator, RetryPolicy}; use tracing::{debug, error, trace}; -const MAX_RANDOM_WALK_ROUNDS: usize = 50; +const MAX_RANDOM_WALK_ROUNDS: usize = 35; pub struct FarmerPieceGetter { piece_provider: PieceProvider, @@ -67,7 +67,7 @@ where trace!(%piece_index, "Getting piece from DSN L2 cache"); let maybe_piece = self .piece_provider - .get_piece(piece_index, Self::convert_retry_policy(retry_policy)) + .get_piece_from_dsn_cache(piece_index, Self::convert_retry_policy(retry_policy)) .await?; if maybe_piece.is_some() { @@ -120,8 +120,6 @@ where trace!(%piece_index, "DSN L1 lookup succeeded"); return Ok(archival_storage_search_result); - } else { - debug!(%piece_index, "Cannot acquire piece from DSN L1"); } debug!( diff --git a/crates/subspace-networking/examples/benchmark.rs b/crates/subspace-networking/examples/benchmark.rs index 80d478b86d..c18e2f4f41 100644 --- a/crates/subspace-networking/examples/benchmark.rs +++ b/crates/subspace-networking/examples/benchmark.rs @@ -157,7 +157,7 @@ async fn simple_benchmark(node: Node, max_pieces: usize, start_with: usize, retr let piece_index = PieceIndex::from(i as u64); let start = Instant::now(); let piece = piece_provider - .get_piece(piece_index, RetryPolicy::Limited(retries)) + .get_piece_from_dsn_cache(piece_index, RetryPolicy::Limited(retries)) .await; let end = Instant::now(); let duration = end.duration_since(start); @@ -220,7 +220,7 @@ async fn parallel_benchmark( .expect("Semaphore cannot be closed."); let semaphore_acquired = Instant::now(); let maybe_piece = piece_provider - .get_piece(piece_index, RetryPolicy::Limited(retries)) + .get_piece_from_dsn_cache(piece_index, RetryPolicy::Limited(retries)) .await; let end = Instant::now(); diff --git a/crates/subspace-networking/src/utils/piece_provider.rs b/crates/subspace-networking/src/utils/piece_provider.rs index 8fae011dd9..c3e0e6901c 100644 --- a/crates/subspace-networking/src/utils/piece_provider.rs +++ b/crates/subspace-networking/src/utils/piece_provider.rs @@ -120,8 +120,9 @@ where None } - /// Returns piece by its index. Uses retry policy for error handling. - pub async fn get_piece( + /// Returns piece by its index from farmer's piece cache (L2). + /// Uses retry policy for error handling. + pub async fn get_piece_from_dsn_cache( &self, piece_index: PieceIndex, retry_policy: RetryPolicy, diff --git a/crates/subspace-service/src/sync_from_dsn/import_blocks.rs b/crates/subspace-service/src/sync_from_dsn/import_blocks.rs index 8a0c8eb363..a3b271250e 100644 --- a/crates/subspace-service/src/sync_from_dsn/import_blocks.rs +++ b/crates/subspace-service/src/sync_from_dsn/import_blocks.rs @@ -280,7 +280,7 @@ where } }; let maybe_piece = match piece_provider - .get_piece( + .get_piece_from_dsn_cache( piece_index, RetryPolicy::Limited(PIECE_GETTER_RETRY_NUMBER.get()), )