leyoda/rqbit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a logging bug

Browse source
This commit is contained in:
Igor Katson 2023-11-19 21:47:58 +00:00
parent b40d33b0ad
commit 98dbecf136
No known key found for this signature in database
GPG key ID: B4EC22B66D61A3F5
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/librqbit/src/torrent_state.rs
View file

@ -72,7 +72,7 @@ pub struct AggregatePeerStats {
pub live: usize, pub live: usize,
pub seen: usize, pub seen: usize,
pub dead: usize, pub dead: usize,
pub fully_have_and_we_are_finished: usize, pub not_needed: usize,
} }
impl PeerStates { impl PeerStates {
@ -89,7 +89,7 @@ impl PeerStates {
PeerState::Live(_) => s.live += 1, PeerState::Live(_) => s.live += 1,
PeerState::Queued => s.queued += 1, PeerState::Queued => s.queued += 1,
PeerState::Dead => s.dead += 1, PeerState::Dead => s.dead += 1,
PeerState::NotNeeded => s.fully_have_and_we_are_finished += 1, PeerState::NotNeeded => s.not_needed += 1,
}; };
s s
}) })
@ -247,7 +247,8 @@ pub struct StatsSnapshot {
pub time: Instant, pub time: Instant,
pub queued_peers: u32, pub queued_peers: u32,
pub dead_peers: u32, pub dead_peers: u32,
total_piece_download_ms: u64, pub total_piece_download_ms: u64,
pub not_needed_peers: u32,
} }
impl StatsSnapshot { impl StatsSnapshot {
@ -331,7 +332,7 @@ mod timed_existence {
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use tracing::warn; use tracing::warn;
const MAX: Duration = Duration::from_millis(5); const MAX: Duration = Duration::from_millis(1);
// Prints if the object exists for too long. // Prints if the object exists for too long.
// This is used to track long-lived locks for debugging. // This is used to track long-lived locks for debugging.
@ -833,6 +834,7 @@ impl TorrentState {
remaining_bytes: remaining, remaining_bytes: remaining,
queued_peers: peer_stats.queued as u32, queued_peers: peer_stats.queued as u32,
dead_peers: peer_stats.dead as u32, dead_peers: peer_stats.dead as u32,
not_needed_peers: peer_stats.not_needed as u32,
total_piece_download_ms: self.stats.total_piece_download_ms.load(Relaxed), total_piece_download_ms: self.stats.total_piece_download_ms.load(Relaxed),
} }
} }
@ -1004,6 +1006,7 @@ impl PeerHandler {
// Additional spawn per peer, not good. // Additional spawn per peer, not good.
spawn( spawn(
span!( span!(
parent: None,
Level::ERROR, Level::ERROR,
"peer_chunk_requester", "peer_chunk_requester",
peer = handle.to_string() peer = handle.to_string()
@ -1123,7 +1126,7 @@ impl PeerHandler {
warn!("probably a bug, we already requested {:?}", chunk); warn!("probably a bug, we already requested {:?}", chunk);
continue; continue;
} }
None => bail!("peer dropped"), None => return Ok(()),
} }
let request = Request { let request = Request {
@ -1131,10 +1134,20 @@ impl PeerHandler {
begin: chunk.offset, begin: chunk.offset,
length: chunk.size, length: chunk.size,
}; };
sem.acquire().await?.forget();
tx.send(WriterRequest::Message(MessageOwned::Request(request))) loop {
.context("peer dropped")?; match timeout(Duration::from_secs(10), sem.acquire()).await {
Ok(acq) => break acq?.forget(),
Err(_) => continue,
};
}
if tx
.send(WriterRequest::Message(MessageOwned::Request(request)))
.is_err()
{
return Ok(());
}
} }
} }
} }

2
crates/rqbit/src/main.rs
View file

@ -267,7 +267,7 @@ async fn async_main(opts: Opts, spawner: BlockingSpawner) -> anyhow::Result<()>
stats.connecting_peers, stats.connecting_peers,
stats.queued_peers, stats.queued_peers,
stats.seen_peers, stats.seen_peers,
stats.dead_peers stats.dead_peers,
); );
}, },
} }