aboutsummaryrefslogtreecommitdiff
path: root/src/block/manager.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-05-09 12:40:08 +0200
committerAlex Auvolat <alex@adnab.me>2023-05-09 12:40:08 +0200
commit351d734e6c035a6f22f9fe0d62a783a81a134f45 (patch)
treeded5a11616d5147ed254bba2974d3591fb1e041f /src/block/manager.rs
parenta1fcf1b175cc11b4e797d81ea483538813732d6d (diff)
parentb925f53dc3b0bae77aa3f73e581faace2eb3b21a (diff)
downloadgarage-351d734e6c035a6f22f9fe0d62a783a81a134f45.tar.gz
garage-351d734e6c035a6f22f9fe0d62a783a81a134f45.zip
Merge branch 'main' into next
Diffstat (limited to 'src/block/manager.rs')
-rw-r--r--src/block/manager.rs30
1 files changed, 25 insertions, 5 deletions
diff --git a/src/block/manager.rs b/src/block/manager.rs
index 26278974..3ece9a8a 100644
--- a/src/block/manager.rs
+++ b/src/block/manager.rs
@@ -600,12 +600,32 @@ impl BlockManager {
/// Utility: check if block is stored compressed. Error if block is not stored
async fn is_block_compressed(&self, hash: &Hash) -> Result<bool, Error> {
let mut path = self.block_path(hash);
- path.set_extension("zst");
- if fs::metadata(&path).await.is_ok() {
- return Ok(true);
+
+ // If compression is disabled on node - check for the raw block
+ // first and then a compressed one (as compression may have been
+ // previously enabled).
+ match self.compression_level {
+ None => {
+ if fs::metadata(&path).await.is_ok() {
+ return Ok(false);
+ }
+
+ path.set_extension("zst");
+
+ fs::metadata(&path).await.map(|_| true).map_err(Into::into)
+ }
+ _ => {
+ path.set_extension("zst");
+
+ if fs::metadata(&path).await.is_ok() {
+ return Ok(true);
+ }
+
+ path.set_extension("");
+
+ fs::metadata(&path).await.map(|_| false).map_err(Into::into)
+ }
}
- path.set_extension("");
- fs::metadata(&path).await.map(|_| false).map_err(Into::into)
}
async fn lock_mutate(&self, hash: &Hash) -> MutexGuard<'_, BlockManagerLocked> {