aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-09-02 16:52:22 +0200
committerAlex Auvolat <alex@adnab.me>2022-09-02 16:52:22 +0200
commit5e8baa433d743a06ab3ee90f375f24c3c36fc236 (patch)
tree752f0e4a28d6b2a8648322d76cf98d23c2b2837e /src
parent47be652a1fe08a8e6dab6aa2c4a41d8eb119f392 (diff)
downloadgarage-5e8baa433d743a06ab3ee90f375f24c3c36fc236.tar.gz
garage-5e8baa433d743a06ab3ee90f375f24c3c36fc236.zip
Make BlockManagerLocked fully private again
Diffstat (limited to 'src')
-rw-r--r--src/block/manager.rs35
-rw-r--r--src/block/resync.rs14
2 files changed, 24 insertions, 25 deletions
diff --git a/src/block/manager.rs b/src/block/manager.rs
index efb5349c..62ef96b9 100644
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@@ -68,7 +68,7 @@ pub struct BlockManager {
compression_level: Option<i32>,
- pub(crate) mutation_lock: Mutex<BlockManagerLocked>,
+ mutation_lock: Mutex<BlockManagerLocked>,
pub(crate) rc: BlockRc,
pub resync: BlockResyncManager,
@@ -84,7 +84,7 @@ pub struct BlockManager {
// This custom struct contains functions that must only be ran
// when the lock is held. We ensure that it is the case by storing
// it INSIDE a Mutex.
-pub(crate) struct BlockManagerLocked();
+struct BlockManagerLocked();
impl BlockManager {
pub fn new(
@@ -331,17 +331,30 @@ impl BlockManager {
Ok(data)
}
- /// Check if this node should have a block, but don't actually have it
- async fn need_block(&self, hash: &Hash) -> Result<bool, Error> {
- let BlockStatus { exists, needed } = self
- .mutation_lock
+ /// Check if this node has a block and whether it needs it
+ pub(crate) async fn check_block_status(&self, hash: &Hash) -> Result<BlockStatus, Error> {
+ self.mutation_lock
.lock()
.await
.check_block_status(hash, self)
- .await?;
+ .await
+ }
+
+ /// Check if this node should have a block, but don't actually have it
+ async fn need_block(&self, hash: &Hash) -> Result<bool, Error> {
+ let BlockStatus { exists, needed } = self.check_block_status(hash).await?;
Ok(needed.is_nonzero() && !exists)
}
+ /// Delete block if it is not needed anymore
+ pub(crate) async fn delete_if_unneeded(&self, hash: &Hash) -> Result<(), Error> {
+ self.mutation_lock
+ .lock()
+ .await
+ .delete_if_unneeded(hash, self)
+ .await
+ }
+
/// Utility: gives the path of the directory in which a block should be found
fn block_dir(&self, hash: &Hash) -> PathBuf {
let mut path = self.data_dir.clone();
@@ -392,7 +405,7 @@ pub(crate) struct BlockStatus {
}
impl BlockManagerLocked {
- pub(crate) async fn check_block_status(
+ async fn check_block_status(
&self,
hash: &Hash,
mgr: &BlockManager,
@@ -479,11 +492,7 @@ impl BlockManagerLocked {
Ok(())
}
- pub(crate) async fn delete_if_unneeded(
- &self,
- hash: &Hash,
- mgr: &BlockManager,
- ) -> Result<(), Error> {
+ async fn delete_if_unneeded(&self, hash: &Hash, mgr: &BlockManager) -> Result<(), Error> {
let BlockStatus { exists, needed } = self.check_block_status(hash, mgr).await?;
if exists && needed.is_deletable() {
diff --git a/src/block/resync.rs b/src/block/resync.rs
index 2a8184b7..dab08338 100644
--- a/src/block/resync.rs
+++ b/src/block/resync.rs
@@ -282,12 +282,7 @@ impl BlockResyncManager {
}
async fn resync_block(&self, manager: &BlockManager, hash: &Hash) -> Result<(), Error> {
- let BlockStatus { exists, needed } = manager
- .mutation_lock
- .lock()
- .await
- .check_block_status(hash, manager)
- .await?;
+ let BlockStatus { exists, needed } = manager.check_block_status(hash).await?;
if exists != needed.is_needed() || exists != needed.is_nonzero() {
debug!(
@@ -370,12 +365,7 @@ impl BlockResyncManager {
who.len()
);
- manager
- .mutation_lock
- .lock()
- .await
- .delete_if_unneeded(hash, manager)
- .await?;
+ manager.delete_if_unneeded(hash).await?;
manager.rc.clear_deleted_block_rc(hash)?;
}