fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-07-31 00:41:59 +00:00
Code Issues Projects Releases Wiki Activity

Kademlia: Fix premature query termination. (#1155)

Browse Source 
* Fix premature query termination.

* Don't skip over 'NotContacted' closest peers.

* Code style tweak.
This commit is contained in:
Roman Borschel
2019-06-03 12:47:01 +02:00
committed by GitHub
parent 3440d1896e
commit 710ce90c6e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
protocols/kad/src/query.rs
View File

@@ -298,7 +298,7 @@ where
// While iterating over peers, count the number of queries in a row (from closer to further
// away from target) that are in the succeeded state.
let mut succeeded_counter = 0;
let mut succeeded_counter = Some(0);
// Extract `self.num_results` to avoid borrowing errors with closures.
let num_results = self.num_results;
@@ -312,16 +312,19 @@ where
return Async::Ready(QueryStatePollOut::CancelRpc { peer_id: peer_id.preimage() });
}
Ok(Async::NotReady) => {
succeeded_counter = None;
active_counter += 1
}
}
}
if let QueryPeerState::Succeeded = state {
succeeded_counter += 1;
// If we have enough results; the query is done.
if succeeded_counter >= num_results {
return Async::Ready(QueryStatePollOut::Finished)
if let Some(ref mut cnt) = succeeded_counter {
*cnt += 1;
// If we have enough results; the query is done.
if *cnt >= num_results {
return Async::Ready(QueryStatePollOut::Finished)
}
}
}
@@ -337,6 +340,11 @@ where
peer_id: peer_id.preimage(),
query_target: &self.target,
});
} else {
// The peer is among the `num_results` closest and still
// needs to be contacted, but the query is currently at
// capacity w.r.t. the allowed parallelism.
return Async::NotReady
}
}
}