diff options
| author | Alex <alex@adnab.me> | 2024-03-19 15:59:19 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-03-19 15:59:19 +0000 |
| commit | 65853a48634d662809eee5dafbe48535d400f4a0 (patch) | |
| tree | 3bb01998fa81651a54ade8bf17ba87b5a3eff970 /src/block/manager.rs | |
| parent | 0038ca8a78f147b9c0ec07ef0121773aaf110dc9 (diff) | |
| parent | 3eab639c146f67fc67534633ae26c9aec116327d (diff) | |
| download | garage-65853a48634d662809eee5dafbe48535d400f4a0.tar.gz garage-65853a48634d662809eee5dafbe48535d400f4a0.zip | |
Merge pull request 'block refcount repair' (#782) from block-ref-repair into next-0.10
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/782
Diffstat (limited to 'src/block/manager.rs')
| -rw-r--r-- | src/block/manager.rs | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/block/manager.rs b/src/block/manager.rs index eeacf8b9..8ee33096 100644 --- a/src/block/manager.rs +++ b/src/block/manager.rs @@ -88,7 +88,7 @@ pub struct BlockManager { mutation_lock: Vec<Mutex<BlockManagerLocked>>, - pub(crate) rc: BlockRc, + pub rc: BlockRc, pub resync: BlockResyncManager, pub(crate) system: Arc<System>, @@ -156,7 +156,7 @@ impl BlockManager { let metrics = BlockManagerMetrics::new( config.compression_level, - rc.rc.clone(), + rc.rc_table.clone(), resync.queue.clone(), resync.errors.clone(), ); @@ -229,6 +229,12 @@ impl BlockManager { } } + /// Initialization: set how block references are recalculated + /// for repair operations + pub fn set_recalc_rc(&self, recalc: Vec<CalculateRefcount>) { + self.rc.recalc_rc.store(Some(Arc::new(recalc))); + } + /// Ask nodes that might have a (possibly compressed) block for it /// Return it as a stream with a header async fn rpc_get_raw_block_streaming( @@ -316,9 +322,9 @@ impl BlockManager { }; } - let msg = format!("Get block {:?}: no node returned a valid block", hash); - debug!("{}", msg); - Err(Error::Message(msg)) + let err = Error::MissingBlock(*hash); + debug!("{}", err); + Err(err) } // ---- Public interface ---- @@ -381,7 +387,7 @@ impl BlockManager { /// Get number of items in the refcount table pub fn rc_len(&self) -> Result<usize, Error> { - Ok(self.rc.rc.len()?) + Ok(self.rc.rc_table.len()?) } /// Send command to start/stop/manager scrub worker |