Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change to restarting of dead peers #239

Merged
merged 6 commits into from
Sep 22, 2024
Merged

Change to restarting of dead peers #239

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
790bc9a
Logging died peers
izderadicka Sep 17, 2024
845a6d6
Ignore incoming for retry, cancel retries after download is complete
izderadicka Sep 18, 2024
db619ab
Remove cancel
izderadicka Sep 20, 2024
b0c3455
Add incoming flag to PeerHandler
izderadicka Sep 21, 2024
e8c31ee
Cleaning up, plus debug
izderadicka Sep 21, 2024
5e55ab0
Fix debug style
izderadicka Sep 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions crates/librqbit/src/torrent_state/live/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ use super::{

#[derive(Debug)]
struct InflightPiece {
peer: PeerHandle,
peer: PeerHandle,
started: Instant,
}

Expand Down Expand Up @@ -399,6 +399,7 @@ impl TorrentStateLive {
// TODO: bump counters for incoming
let handler = PeerHandler {
addr: checked_peer.addr,
incoming: true,
on_bitfield_notify: Default::default(),
unchoke_notify: Default::default(),
locked: RwLock::new(PeerHandlerLocked { i_am_choked: true }),
Expand Down Expand Up @@ -463,6 +464,7 @@ impl TorrentStateLive {

let handler = PeerHandler {
addr,
incoming: false,
on_bitfield_notify: Default::default(),
unchoke_notify: Default::default(),
locked: RwLock::new(PeerHandlerLocked { i_am_choked: true }),
Expand Down Expand Up @@ -818,7 +820,7 @@ struct PeerHandler {
requests_sem: Semaphore,

addr: SocketAddr,

incoming: bool,
tx: PeerTx,

first_message_received: AtomicBool,
Expand Down Expand Up @@ -999,7 +1001,7 @@ impl PeerHandler {
}
};

let _error = match error {
let error = match error {
Some(e) => e,
None => {
trace!("peer died without errors, not re-queueing");
Expand All @@ -1018,17 +1020,27 @@ impl PeerHandler {

pe.value_mut().state.set(PeerState::Dead, &pstats);

if self.incoming {
// do not retry incoming peers
return Ok(());
}

let backoff = pe.value_mut().stats.backoff.next_backoff();

// Prevent deadlocks.
drop(pe);

if let Some(dur) = backoff {
debug!(
"{} peer {} died - {error} and will retry in {dur:?}",
if self.incoming { "incoming" } else { "outgoing" },
self.addr
);
self.state.clone().spawn(
error_span!(
parent: self.state.torrent.span.clone(),
"wait_for_peer",
peer = handle.to_string(),
peer = handle.to_string(),
duration = format!("{dur:?}")
),
async move {
Expand Down
Loading