forked from Deuxfleurs/garage
add checksum to end of file instead of decompressing
This commit is contained in:
parent
01c623e391
commit
9215d63e3a
1 changed files with 31 additions and 17 deletions
|
@ -158,22 +158,30 @@ impl BlockManager {
|
||||||
if self.is_block_compressed(hash).await.is_ok() {
|
if self.is_block_compressed(hash).await.is_ok() {
|
||||||
return Ok(Message::Ok);
|
return Ok(Message::Ok);
|
||||||
}
|
}
|
||||||
let _lock = self.data_dir_lock.lock().await;
|
|
||||||
|
|
||||||
let mut path = self.block_dir(hash);
|
let mut path = self.block_dir(hash);
|
||||||
fs::create_dir_all(&path).await?;
|
|
||||||
|
|
||||||
path.push(hex::encode(hash));
|
let (buffer, checksum) = match data {
|
||||||
let buffer = match data {
|
BlockData::Plain(b) => (b, None),
|
||||||
BlockData::Plain(b) => b,
|
|
||||||
BlockData::Compressed(b) => {
|
BlockData::Compressed(b) => {
|
||||||
path.set_extension("zst");
|
let checksum = blake2sum(&b);
|
||||||
b
|
(b, Some(checksum))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let _lock = self.data_dir_lock.lock().await;
|
||||||
|
|
||||||
|
fs::create_dir_all(&path).await?;
|
||||||
|
path.push(hex::encode(hash));
|
||||||
|
if checksum.is_some() {
|
||||||
|
path.set_extension("zst.b2");
|
||||||
|
}
|
||||||
|
|
||||||
let mut f = fs::File::create(path).await?;
|
let mut f = fs::File::create(path).await?;
|
||||||
f.write_all(&buffer).await?;
|
f.write_all(&buffer).await?;
|
||||||
|
if let Some(checksum) = checksum {
|
||||||
|
f.write_all(checksum.as_slice()).await?;
|
||||||
|
}
|
||||||
drop(f);
|
drop(f);
|
||||||
|
|
||||||
Ok(Message::Ok)
|
Ok(Message::Ok)
|
||||||
|
@ -190,7 +198,7 @@ impl BlockManager {
|
||||||
f.map(|f| (f, false)).map_err(Into::into)
|
f.map(|f| (f, false)).map_err(Into::into)
|
||||||
}
|
}
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
path.set_extension("zst");
|
path.set_extension("zst.b2");
|
||||||
let f = fs::File::open(&path).await;
|
let f = fs::File::open(&path).await;
|
||||||
f.map(|f| (f, true)).map_err(Into::into)
|
f.map(|f| (f, true)).map_err(Into::into)
|
||||||
}
|
}
|
||||||
|
@ -207,14 +215,19 @@ impl BlockManager {
|
||||||
f.read_to_end(&mut data).await?;
|
f.read_to_end(&mut data).await?;
|
||||||
drop(f);
|
drop(f);
|
||||||
|
|
||||||
let sum = if compressed {
|
let sum_ok = if compressed {
|
||||||
zstd_decode(&data[..])
|
if data.len() >= 32 {
|
||||||
.ok()
|
let data_len = data.len() - 32;
|
||||||
.map(|decompressed| blake2sum(&decompressed[..]))
|
let checksum = data.split_off(data_len);
|
||||||
|
blake2sum(&data[..]).as_slice() == &checksum
|
||||||
} else {
|
} else {
|
||||||
Some(blake2sum(&data[..]))
|
// the file is too short to be valid
|
||||||
|
false
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
blake2sum(&data[..]) == *hash
|
||||||
};
|
};
|
||||||
if sum.is_none() || sum.unwrap() != *hash {
|
if !sum_ok {
|
||||||
let _lock = self.data_dir_lock.lock().await;
|
let _lock = self.data_dir_lock.lock().await;
|
||||||
warn!(
|
warn!(
|
||||||
"Block {:?} is corrupted. Renaming to .corrupted and resyncing.",
|
"Block {:?} is corrupted. Renaming to .corrupted and resyncing.",
|
||||||
|
@ -257,11 +270,12 @@ impl BlockManager {
|
||||||
|
|
||||||
async fn is_block_compressed(&self, hash: &Hash) -> Result<bool, Error> {
|
async fn is_block_compressed(&self, hash: &Hash) -> Result<bool, Error> {
|
||||||
let mut path = self.block_path(hash);
|
let mut path = self.block_path(hash);
|
||||||
|
path.set_extension("zst.b2");
|
||||||
if fs::metadata(&path).await.is_ok() {
|
if fs::metadata(&path).await.is_ok() {
|
||||||
return Ok(false);
|
return Ok(true);
|
||||||
}
|
}
|
||||||
path.set_extension("zst");
|
path.set_extension("");
|
||||||
fs::metadata(&path).await.map(|_| true).map_err(Into::into)
|
fs::metadata(&path).await.map(|_| false).map_err(Into::into)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn block_dir(&self, hash: &Hash) -> PathBuf {
|
fn block_dir(&self, hash: &Hash) -> PathBuf {
|
||||||
|
|
Loading…
Reference in a new issue