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

cli: fix check for synced replicas 

If the expected replica count had exceeded the amount of seeds already
synced with the following message would appear:

    Not connected to any seeds for {rid}.

This is not true, since there are seeds that were already synced.

This is fixed by calculating the `synced` and `connected` nodes,
without the local peer in the set. This means that the check for
`synced.len() >= connected.len()` will get a hit and the function will
correctly return early.

Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com>
X-Clacks-Overhead: GNU Terry Pratchett
This commit is contained in:
Fintan Halpenny 2023-12-21 15:38:46 +00:00 committed by cloudhead
parent 16478e721b
commit b6d8bc9489
No known key found for this signature in database
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
radicle-cli/src/commands/sync.rs
View File

@ -398,15 +398,21 @@ fn announce_refs(
} }
} }
RepoSync::Replicas(replicas) => { RepoSync::Replicas(replicas) => {
let synced = synced.collect::<Vec<_>>(); let synced = synced
if synced.len() >= seeds.len() { .filter(|s| &s.nid != profile.id())
.collect::<Vec<_>>();
let connected = seeds
.connected()
.filter(|s| &s.nid != profile.id())
.collect::<Vec<_>>();
if synced.len() >= connected.len() {
term::success!( term::success!(
"Nothing to announce, already in sync with network (see `rad sync status`)" "Nothing to announce, already in sync with network (see `rad sync status`)"
); );
return Ok(()); return Ok(());
} }
// Replicas not counting our local replica. // Replicas not counting our local replica.
let remotes = synced.iter().filter(|s| &s.nid != profile.id()).count(); let remotes = synced.len();
if remotes >= replicas { if remotes >= replicas {
term::success!("Nothing to announce, already in sync with {remotes} seed(s) (see `rad sync status`)"); term::success!("Nothing to announce, already in sync with {remotes} seed(s) (see `rad sync status`)");
return Ok(()); return Ok(());