fixup! Complete making blocks and blobs db atomic
This commit is contained in:
parent
38fe2dce3f
commit
290e1d2ff7
@ -907,15 +907,17 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
|
|||||||
};
|
};
|
||||||
// Rollback on failure
|
// Rollback on failure
|
||||||
if let Err(e) = tx_res {
|
if let Err(e) = tx_res {
|
||||||
|
let mut blob_cache_ops = blob_cache_ops;
|
||||||
for op in blob_cache_ops.iter_mut() {
|
for op in blob_cache_ops.iter_mut() {
|
||||||
let reverse_op = match op {
|
let reverse_op = match op {
|
||||||
StoreOp::PutBlobs(block_root, _) => StoreOp::DeleteBlobs(block_root),
|
StoreOp::PutBlobs(block_root, _) => StoreOp::DeleteBlobs(*block_root),
|
||||||
StoreOp::DeleteBlobs(_) => match blobs_to_delete.pop() {
|
StoreOp::DeleteBlobs(_) => match blobs_to_delete.pop() {
|
||||||
Some(blobs) => StoreOp::PutBlobs(blobs.beacon_block_root, Arc::new(blobs)),
|
Some(blobs) => StoreOp::PutBlobs(blobs.beacon_block_root, Arc::new(blobs)),
|
||||||
None => return Err(HotColdDBError::Rollback.into()),
|
None => return Err(HotColdDBError::Rollback.into()),
|
||||||
},
|
},
|
||||||
_ => return Err(HotColdDBError::Rollback.into()),
|
_ => return Err(HotColdDBError::Rollback.into()),
|
||||||
};
|
};
|
||||||
|
*op = reverse_op;
|
||||||
}
|
}
|
||||||
blobs_db.do_atomically(self.convert_to_kv_batch(blob_cache_ops)?)?;
|
blobs_db.do_atomically(self.convert_to_kv_batch(blob_cache_ops)?)?;
|
||||||
return Err(e);
|
return Err(e);
|
||||||
|
Loading…
Reference in New Issue
Block a user