Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Add appropriate fsync() calls in write_block

Browse source 
to ensure that data is persisted properly
This commit is contained in:
Alex 2022-03-01 11:52:12 +01:00
parent fe62d01b7e
commit dc5ec4ecf9
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/model/block.rs
View file

@ -862,9 +862,11 @@ impl BlockManagerLocked {
let data = data.inner_buffer(); let data = data.inner_buffer();
let mut path = mgr.block_dir(hash); let mut path = mgr.block_dir(hash);
fs::create_dir_all(&path).await?; let directory = path.clone();
path.push(hex::encode(hash)); path.push(hex::encode(hash));
fs::create_dir_all(&directory).await?;
let to_delete = match (mgr.is_block_compressed(hash).await, compressed) { let to_delete = match (mgr.is_block_compressed(hash).await, compressed) {
(Ok(true), _) => return Ok(BlockRpc::Ok), (Ok(true), _) => return Ok(BlockRpc::Ok),
(Ok(false), false) => return Ok(BlockRpc::Ok), (Ok(false), false) => return Ok(BlockRpc::Ok),
@ -885,6 +887,7 @@ impl BlockManagerLocked {
path2.set_extension("tmp"); path2.set_extension("tmp");
let mut f = fs::File::create(&path2).await?; let mut f = fs::File::create(&path2).await?;
f.write_all(data).await?; f.write_all(data).await?;
f.sync_all().await?;
drop(f); drop(f);
fs::rename(path2, path).await?; fs::rename(path2, path).await?;
@ -892,6 +895,14 @@ impl BlockManagerLocked {
fs::remove_file(to_delete).await?; fs::remove_file(to_delete).await?;
} }
let dir = fs::OpenOptions::new()
.read(true)
.mode(0)
.open(directory)
.await?;
dir.sync_all().await?;
drop(dir);
Ok(BlockRpc::Ok) Ok(BlockRpc::Ok)
} }