diff options
| author | Alex <alex@adnab.me> | 2024-03-28 12:40:27 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-03-28 12:40:27 +0000 |
| commit | ecf641d88c264f7278d13a6d988288feb24a5dfe (patch) | |
| tree | 5cd60dfa4f0d6d32a66d2e32d7912c9e289067c8 /src/block/resync.rs | |
| parent | 75cd14926d8dec8c36289197822df78391686c6a (diff) | |
| parent | 85f580cbde4913fe8382316ff3c27b8443c61dd7 (diff) | |
| download | garage-ecf641d88c264f7278d13a6d988288feb24a5dfe.tar.gz garage-ecf641d88c264f7278d13a6d988288feb24a5dfe.zip | |
Merge pull request 'Fix unbounded buffering when one node has slower network' (#792) from fix-buffering into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/792
Diffstat (limited to 'src/block/resync.rs')
| -rw-r--r-- | src/block/resync.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/block/resync.rs b/src/block/resync.rs index 9c1da4a7..7221b093 100644 --- a/src/block/resync.rs +++ b/src/block/resync.rs @@ -436,7 +436,7 @@ impl BlockResyncManager { &manager.endpoint, &need_nodes[..], put_block_message, - RequestStrategy::with_priority(PRIO_BACKGROUND) + RequestStrategy::with_priority(PRIO_BACKGROUND | PRIO_SECONDARY) .with_quorum(need_nodes.len()), ) .await @@ -460,7 +460,9 @@ impl BlockResyncManager { hash ); - let block_data = manager.rpc_get_raw_block(hash, None).await?; + let block_data = manager + .rpc_get_raw_block(hash, PRIO_BACKGROUND | PRIO_SECONDARY, None) + .await?; manager.metrics.resync_recv_counter.add(1); |