mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

node: Fix fetch requests code 

We were not correctly deleting the fetch request, since only one
was kept per RID.
This commit is contained in:
Alexis Sellier 2023-03-24 12:58:49 +01:00
parent fe8953ab8b
commit da9d63b284
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
radicle-node/src/service.rs
View File

@ -187,7 +187,7 @@ pub struct Service<R, A, S, G> {
/// Source of entropy. /// Source of entropy.
rng: Rng, rng: Rng,
/// Fetch requests initiated by user, which are waiting for results. /// Fetch requests initiated by user, which are waiting for results.
fetch_reqs: HashMap<Id, chan::Sender<FetchResult>>, fetch_reqs: HashMap<(Id, NodeId), chan::Sender<FetchResult>>,
/// Current tracked repository bloom filter. /// Current tracked repository bloom filter.
filter: Filter, filter: Filter,
/// Last time the service was idle. /// Last time the service was idle.
@ -465,9 +465,7 @@ where
}, },
Command::Fetch(rid, seed, resp) => { Command::Fetch(rid, seed, resp) => {
// TODO: Establish connections to unconnected seeds, and retry. // TODO: Establish connections to unconnected seeds, and retry.
// TODO: Fetch requests should be queued and re-checked to see if they can self.fetch_reqs.insert((rid, seed), resp);
// be fulfilled everytime a new node connects.
self.fetch_reqs.insert(rid, resp);
self.fetch(rid, &seed); self.fetch(rid, &seed);
} }
Command::TrackRepo(rid, scope, resp) => { Command::TrackRepo(rid, scope, resp) => {
@ -550,7 +548,7 @@ where
Err(err) => { Err(err) => {
error!(target: "service", "Error getting namespaces for {rid}: {err}"); error!(target: "service", "Error getting namespaces for {rid}: {err}");
if let Some(resp) = self.fetch_reqs.get(&rid) { if let Some(resp) = self.fetch_reqs.remove(&(rid, seed)) {
resp.send(FetchResult::Failed { resp.send(FetchResult::Failed {
reason: err.to_string(), reason: err.to_string(),
}) })
@ -611,15 +609,11 @@ where
} }
}; };
if let Some(results) = self.fetch_reqs.get(&rid) { if let Some(results) = self.fetch_reqs.remove(&(rid, remote)) {
log::debug!(target: "service", "Found existing fetch request, sending result.."); log::debug!(target: "service", "Found existing fetch request, sending result..");
if results.send(result).is_err() { if results.send(result).is_err() {
log::error!(target: "service", "Error sending fetch result for {rid}.."); log::error!(target: "service", "Error sending fetch result for {rid}..");
// FIXME: We should remove the channel even on success, once all seeds
// were fetched from. Otherwise an organic fetch will try to send on the
// channel.
self.fetch_reqs.remove(&rid);
} else { } else {
log::debug!(target: "service", "Sent fetch result for {rid}.."); log::debug!(target: "service", "Sent fetch result for {rid}..");
} }
@ -717,7 +711,7 @@ where
// If the peer disconnected while we were waiting for a [`Message::FetchOk`], // If the peer disconnected while we were waiting for a [`Message::FetchOk`],
// return a failure to any potential fetcher. // return a failure to any potential fetcher.
if let Some((requested, _)) = session.requesting() { if let Some((requested, _)) = session.requesting() {
if let Some(resp) = self.fetch_reqs.remove(requested) { if let Some(resp) = self.fetch_reqs.remove(&(*requested, remote)) {
resp.send(FetchResult::Failed { resp.send(FetchResult::Failed {
reason: format!("disconnected: {reason}"), reason: format!("disconnected: {reason}"),
}) })