diff options
| author | Alex <alex@adnab.me> | 2024-01-11 10:58:08 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-01-11 10:58:08 +0000 |
| commit | 8a6ec1d6111a60e602c90ade2200b2dab5733fe3 (patch) | |
| tree | b8daac4f41050339c87106d72ce7224f7eef38aa /src/block/resync.rs | |
| parent | 723e56b37f13f078a15e067343191fb1bf96e8b2 (diff) | |
| parent | 0041b013a473e3ae72f50209d8f79db75a72848b (diff) | |
| download | garage-8a6ec1d6111a60e602c90ade2200b2dab5733fe3.tar.gz garage-8a6ec1d6111a60e602c90ade2200b2dab5733fe3.zip | |
Merge pull request 'NLnet task 3' (#667) from nlnet-task3 into next-0.10
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/667
Diffstat (limited to 'src/block/resync.rs')
| -rw-r--r-- | src/block/resync.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/block/resync.rs b/src/block/resync.rs index 9c1da4a7..15f210e4 100644 --- a/src/block/resync.rs +++ b/src/block/resync.rs @@ -377,7 +377,7 @@ impl BlockResyncManager { info!("Resync block {:?}: offloading and deleting", hash); let existing_path = existing_path.unwrap(); - let mut who = manager.replication.write_nodes(hash); + let mut who = manager.replication.storage_nodes(hash); if who.len() < manager.replication.write_quorum() { return Err(Error::Message("Not trying to offload block because we don't have a quorum of nodes to write to".to_string())); } @@ -385,7 +385,7 @@ impl BlockResyncManager { let who_needs_resps = manager .system - .rpc + .rpc_helper() .call_many( &manager.endpoint, &who, @@ -431,10 +431,10 @@ impl BlockResyncManager { .with_stream_from_buffer(bytes); manager .system - .rpc + .rpc_helper() .try_call_many( &manager.endpoint, - &need_nodes[..], + &need_nodes, put_block_message, RequestStrategy::with_priority(PRIO_BACKGROUND) .with_quorum(need_nodes.len()), |