zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Commit sled state in a transaction (#933) 

Fixes a race condition between the height and hash tree updates, when
they are executed simultaneously with GetDepth. `get_tip` uses the height
tree, but `get` uses the hash tree.
This commit is contained in:
teor 2020-08-22 05:36:00 +10:00 committed by GitHub
parent 3400b72699
commit 6a3615e039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra-state/src/on_disk.rs
View File

@ -40,6 +40,8 @@ impl SledState {
&mut self,
block: impl Into<Arc<Block>> + std::fmt::Debug,
) -> Result<block::Hash, Error> {
use sled::Transactional;
let block = block.into();
let hash = block.hash();
let height = block.coinbase_height().unwrap();
@ -49,9 +51,11 @@ impl SledState {
let bytes = block.zcash_serialize_to_vec()?;
// TODO(jlusby): make this transactional
height_map.insert(&height.0.to_be_bytes(), &hash.0)?;
by_hash.insert(&hash.0, bytes)?;
(&height_map, &by_hash).transaction(|(height_map, by_hash)| {
height_map.insert(&height.0.to_be_bytes(), &hash.0)?;
by_hash.insert(&hash.0, bytes.clone())?;
Ok(())
})?;
Ok(hash)
}
@ -280,6 +284,7 @@ impl_from! {
SerializationError,
std::io::Error,
sled::Error,
sled::transaction::TransactionError,
}
impl Into<BoxError> for Error {