feat: lift the client's concurrency ceiling from ~15 peers to 1024
The client had never been driven at scale. A stress harness that mixes searches, downloads, uploads and browses against a local soulfind found four ceilings, three of which lose work silently rather than merely being slow. Peers were capped at one per core. ActorSystem ran each actor's whole lifetime as one job on a fixed-size ThreadPool, and actor loops block until stopped, so the pool acted as a semaphore: past the cap an actor never started, never connected and never errored, and uploads stopped working entirely. The pool had exactly one consumer and every job it received was non-terminating, so it is gone; actors get their own thread. TransferResponse raced the bookkeeping it depends on. It was sent straight back to the peer while UpdateDownloadTokens was still queued for the client loop — but the response is what invites the peer's file connection, and that connection is matched by token. Under load the client loop lost, the file connection matched nothing, and the download sat on Queued forever. The response now goes out after the token is recorded. Download tokens were md5(filename) truncated to 20 bits, and the store deletes every entry matching a token, so two downloads sharing one destroyed each other — which fetching the same filename from two peers does every time. They now come from a counter. Port 0 from GetPeerAddress means the server does not know where a user listens. It was cached and dialled, and the upload waiting on it was dropped. It is no longer cached or served against; the connect attempt stays, because its failure is what makes an unreachable peer fall back to server brokering. Mixed profile at 1024 peers: 512/512 downloads, 256/256 uploads, 400-850 MiB/s in ~7s, against 71/96 downloads at 7.9 MiB/s and a 60s timeout before.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
use super::{
|
||||
Arc, Client, ClientContext, Download, DownloadMetadata, DownloadStatus,
|
||||
Receiver, Result, RwLock, RwLockExt, Sender, error, info, md5, mpsc,
|
||||
Receiver, Result, RwLock, RwLockExt, Sender, error, info, mpsc,
|
||||
next_download_token,
|
||||
};
|
||||
|
||||
impl Client {
|
||||
@@ -52,9 +53,8 @@ impl Client {
|
||||
}
|
||||
|
||||
/// Remove every download for `username`/`filename` regardless of status.
|
||||
/// Call this before re-issuing [`Client::download`] for a failed download,
|
||||
/// otherwise the stale entry (whose md5-derived token equals the retry's)
|
||||
/// shadows the fresh one and its completion is misrouted.
|
||||
/// Useful before re-issuing [`Client::download`] for a failed download, so
|
||||
/// the list does not accumulate dead entries for the same file.
|
||||
///
|
||||
/// Returns whether anything was removed.
|
||||
#[must_use]
|
||||
@@ -94,8 +94,7 @@ impl Client {
|
||||
) -> Result<(Download, Receiver<DownloadStatus>)> {
|
||||
info!("[client] Downloading {} from {}", filename, username);
|
||||
|
||||
let hash = md5::md5(&filename);
|
||||
let token = u32::from_str_radix(&hash[0..5], 16)?;
|
||||
let token = next_download_token();
|
||||
|
||||
let (download_sender, download_receiver): (
|
||||
Sender<DownloadStatus>,
|
||||
@@ -189,3 +188,29 @@ impl Client {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::next_download_token;
|
||||
use std::collections::HashSet;
|
||||
|
||||
// The download store is keyed by token and removes *every* entry matching
|
||||
// one, so two downloads sharing a token means queueing one silently evicts
|
||||
// the other — which is what fetching the same filename from two peers does
|
||||
// if the token depends on the filename.
|
||||
#[test]
|
||||
fn download_tokens_are_unique_and_below_the_upload_range() {
|
||||
let tokens: Vec<u32> =
|
||||
(0..10_000).map(|_| next_download_token()).collect();
|
||||
|
||||
assert_eq!(
|
||||
tokens.iter().collect::<HashSet<_>>().len(),
|
||||
tokens.len(),
|
||||
"every download must get its own token"
|
||||
);
|
||||
assert!(
|
||||
tokens.iter().all(|t| *t < 0x8000_0000),
|
||||
"download tokens must not reach into the upload range"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user