YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-02 02:35:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ws: add metrics for number of peers

Browse source
This commit is contained in:
Joakim Frostegård 2023-01-17 20:51:12 +01:00
parent 3ac12b947f
commit 8b7c3c481c
1 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

59
aquatic_ws/src/workers/swarm.rs
View file

@ -58,7 +58,6 @@ type PeerMap = IndexMap<PeerId, Peer>;
struct TorrentData { struct TorrentData {
pub peers: PeerMap, pub peers: PeerMap,
pub num_seeders: usize, pub num_seeders: usize,
pub num_leechers: usize,
} }
impl Default for TorrentData { impl Default for TorrentData {
@ -67,7 +66,6 @@ impl Default for TorrentData {
Self { Self {
peers: Default::default(), peers: Default::default(),
num_seeders: 0, num_seeders: 0,
num_leechers: 0,
} }
} }
} }
@ -77,11 +75,13 @@ impl TorrentData {
if let Some(peer) = self.peers.remove(&peer_id) { if let Some(peer) = self.peers.remove(&peer_id) {
if peer.seeder { if peer.seeder {
self.num_seeders -= 1; self.num_seeders -= 1;
} else {
self.num_leechers -= 1;
} }
} }
} }
pub fn num_leechers(&self) -> usize {
self.peers.len() - self.num_seeders
}
} }
type TorrentMap = AmortizedIndexMap<InfoHash, TorrentData>; type TorrentMap = AmortizedIndexMap<InfoHash, TorrentData>;
@ -102,8 +102,8 @@ impl TorrentMaps {
let mut access_list_cache = create_access_list_cache(access_list); let mut access_list_cache = create_access_list_cache(access_list);
let now = server_start_instant.seconds_elapsed(); let now = server_start_instant.seconds_elapsed();
Self::clean_torrent_map(config, &mut access_list_cache, &mut self.ipv4, now); Self::clean_torrent_map(config, &mut access_list_cache, &mut self.ipv4, now, "4");
Self::clean_torrent_map(config, &mut access_list_cache, &mut self.ipv6, now); Self::clean_torrent_map(config, &mut access_list_cache, &mut self.ipv6, now, "6");
} }
fn clean_torrent_map( fn clean_torrent_map(
@ -111,7 +111,10 @@ impl TorrentMaps {
access_list_cache: &mut AccessListCache, access_list_cache: &mut AccessListCache,
torrent_map: &mut TorrentMap, torrent_map: &mut TorrentMap,
now: SecondsSinceServerStart, now: SecondsSinceServerStart,
ip_version: &'static str,
) { ) {
let mut total_num_peers = 0u64;
torrent_map.retain(|info_hash, torrent_data| { torrent_map.retain(|info_hash, torrent_data| {
if !access_list_cache if !access_list_cache
.load() .load()
@ -121,26 +124,28 @@ impl TorrentMaps {
} }
let num_seeders = &mut torrent_data.num_seeders; let num_seeders = &mut torrent_data.num_seeders;
let num_leechers = &mut torrent_data.num_leechers;
torrent_data.peers.retain(|_, peer| { torrent_data.peers.retain(|_, peer| {
let keep = peer.valid_until.valid(now); let keep = peer.valid_until.valid(now);
if !keep { if (!keep) & peer.seeder {
if peer.seeder { *num_seeders -= 1;
*num_seeders -= 1;
} else {
*num_leechers -= 1;
}
} }
keep keep
}); });
total_num_peers += torrent_data.peers.len() as u64;
!torrent_data.peers.is_empty() !torrent_data.peers.is_empty()
}); });
torrent_map.shrink_to_fit(); torrent_map.shrink_to_fit();
let total_num_peers = total_num_peers as f64;
#[cfg(feature = "metrics")]
::metrics::gauge!("aquatic_peers", total_num_peers, "ip_version" => ip_version);
} }
} }
@ -307,11 +312,12 @@ fn handle_announce_request(
request_sender_meta: InMessageMeta, request_sender_meta: InMessageMeta,
request: AnnounceRequest, request: AnnounceRequest,
) { ) {
let torrent_data: &mut TorrentData = if let IpVersion::V4 = request_sender_meta.ip_version { let (torrent_data, ip_version): (&mut TorrentData, &'static str) =
torrent_maps.ipv4.entry(request.info_hash).or_default() if let IpVersion::V4 = request_sender_meta.ip_version {
} else { (torrent_maps.ipv4.entry(request.info_hash).or_default(), "4")
torrent_maps.ipv6.entry(request.info_hash).or_default() } else {
}; (torrent_maps.ipv6.entry(request.info_hash).or_default(), "6")
};
// If there is already a peer with this peer_id, check that connection id // If there is already a peer with this peer_id, check that connection id
// is same as that of request sender. Otherwise, ignore request. Since // is same as that of request sender. Otherwise, ignore request. Since
@ -334,8 +340,6 @@ fn handle_announce_request(
let opt_removed_peer = match peer_status { let opt_removed_peer = match peer_status {
PeerStatus::Leeching => { PeerStatus::Leeching => {
torrent_data.num_leechers += 1;
let peer = Peer { let peer = Peer {
connection_id: request_sender_meta.connection_id, connection_id: request_sender_meta.connection_id,
consumer_id: request_sender_meta.out_message_consumer_id, consumer_id: request_sender_meta.out_message_consumer_id,
@ -360,14 +364,13 @@ fn handle_announce_request(
PeerStatus::Stopped => torrent_data.peers.remove(&request.peer_id), PeerStatus::Stopped => torrent_data.peers.remove(&request.peer_id),
}; };
match opt_removed_peer.map(|peer| peer.seeder) { if let Some(removed_peer) = opt_removed_peer {
Some(false) => { if removed_peer.seeder {
torrent_data.num_leechers -= 1;
}
Some(true) => {
torrent_data.num_seeders -= 1; torrent_data.num_seeders -= 1;
} }
_ => {} } else {
#[cfg(feature = "metrics")]
::metrics::increment_gauge!("aquatic_peers", 1.0, "ip_version" => ip_version);
} }
} }
@ -437,7 +440,7 @@ fn handle_announce_request(
action: AnnounceAction, action: AnnounceAction,
info_hash: request.info_hash, info_hash: request.info_hash,
complete: torrent_data.num_seeders, complete: torrent_data.num_seeders,
incomplete: torrent_data.num_leechers, incomplete: torrent_data.num_leechers(),
announce_interval: config.protocol.peer_announce_interval, announce_interval: config.protocol.peer_announce_interval,
}); });
@ -475,7 +478,7 @@ fn handle_scrape_request(
let stats = ScrapeStatistics { let stats = ScrapeStatistics {
complete: torrent_data.num_seeders, complete: torrent_data.num_seeders,
downloaded: 0, // No implementation planned downloaded: 0, // No implementation planned
incomplete: torrent_data.num_leechers, incomplete: torrent_data.num_leechers(),
}; };
out_message.files.insert(info_hash, stats); out_message.files.insert(info_hash, stats);