Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(db): Fix write stalls in RocksDB #250

Merged
merged 2 commits into from
Oct 18, 2023
Merged

fix(db): Fix write stalls in RocksDB #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98598c2
Handle stalled writes in RocksDB
slowli Oct 18, 2023
73935c8
Remove `tune_options` arg from `RocksDB` constructor
slowli Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/bin/merkle_tree_consistency_checker/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl Cli {
let db_path = &config.merkle_tree.path;
tracing::info!("Verifying consistency of Merkle tree at {db_path}");
let start = Instant::now();
let db = RocksDB::new(Path::new(db_path), true);
let db = RocksDB::new(Path::new(db_path));
let tree = ZkSyncTree::new_lightweight(db);

let l1_batch_number = if let Some(number) = self.l1_batch {
Expand Down
2 changes: 1 addition & 1 deletion core/lib/merkle_tree/examples/loadtest/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ impl Cli {
dir.path().to_string_lossy()
);
rocksdb = if let Some(block_cache_capacity) = self.block_cache {
let db = RocksDB::with_cache(dir.path(), true, Some(block_cache_capacity));
let db = RocksDB::with_cache(dir.path(), Some(block_cache_capacity));
RocksDBWrapper::from(db)
} else {
RocksDBWrapper::new(dir.path())
Expand Down
3 changes: 1 addition & 2 deletions core/lib/merkle_tree/src/storage/rocksdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ impl RocksDBWrapper {

/// Creates a new wrapper, initializing RocksDB at the specified directory.
pub fn new(path: &Path) -> Self {
let db = RocksDB::new(path, true);
Self::from(db)
Self::from(RocksDB::new(path))
}

/// Sets the chunk size for multi-get operations. The requested keys will be split
Expand Down
36 changes: 18 additions & 18 deletions core/lib/merkle_tree/tests/integration/domain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fn basic_workflow() {
let logs = gen_storage_logs();

let (metadata, expected_root_hash) = {
let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(db);
let metadata = tree.process_l1_batch(&logs);
tree.save();
Expand All @@ -66,7 +66,7 @@ fn basic_workflow() {
]),
);

let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let tree = ZkSyncTree::new_lightweight(db);
tree.verify_consistency(L1BatchNumber(0));
assert_eq!(tree.root_hash(), expected_root_hash);
Expand All @@ -80,7 +80,7 @@ fn basic_workflow_multiblock() {
let blocks = logs.chunks(9);

let expected_root_hash = {
let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(db);
tree.use_dedicated_thread_pool(2);
for block in blocks {
Expand All @@ -98,7 +98,7 @@ fn basic_workflow_multiblock() {
]),
);

let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let tree = ZkSyncTree::new_lightweight(db);
assert_eq!(tree.root_hash(), expected_root_hash);
assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(12));
Expand All @@ -107,7 +107,7 @@ fn basic_workflow_multiblock() {
#[test]
fn filtering_out_no_op_writes() {
let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new(db);
let mut logs = gen_storage_logs();
let root_hash = tree.process_l1_batch(&logs).root_hash;
Expand Down Expand Up @@ -142,7 +142,7 @@ fn filtering_out_no_op_writes() {
#[test]
fn revert_blocks() {
let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());

// Generate logs and save them to DB.
// Produce 4 blocks with distinct values and 1 block with modified values from first block
Expand Down Expand Up @@ -198,7 +198,7 @@ fn revert_blocks() {
}

// Revert the last block.
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
{
let mut tree = ZkSyncTree::new_lightweight(storage);
assert_eq!(tree.root_hash(), tree_metadata.last().unwrap().root_hash);
Expand All @@ -208,7 +208,7 @@ fn revert_blocks() {
}

// Revert two more blocks.
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
{
let mut tree = ZkSyncTree::new_lightweight(storage);
tree.revert_logs(L1BatchNumber(1));
Expand All @@ -217,7 +217,7 @@ fn revert_blocks() {
}

// Revert two more blocks second time; the result should be the same
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
{
let mut tree = ZkSyncTree::new_lightweight(storage);
tree.revert_logs(L1BatchNumber(1));
Expand All @@ -226,7 +226,7 @@ fn revert_blocks() {
}

// Reapply one of the reverted logs
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
{
let storage_log = mirror_logs.get(3 * block_size).unwrap();
let mut tree = ZkSyncTree::new_lightweight(storage);
Expand All @@ -235,15 +235,15 @@ fn revert_blocks() {
}

// check saved block number
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
let tree = ZkSyncTree::new_lightweight(storage);
assert_eq!(tree.next_l1_batch_number(), L1BatchNumber(3));
}

#[test]
fn reset_tree() {
let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
let storage = RocksDB::new(temp_dir.as_ref(), false);
let storage = RocksDB::new(temp_dir.as_ref());
let logs = gen_storage_logs();
let mut tree = ZkSyncTree::new_lightweight(storage);
let empty_root_hash = tree.root_hash();
Expand All @@ -266,14 +266,14 @@ fn read_logs() {
logs.truncate(5);

let write_metadata = {
let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(db);
let metadata = tree.process_l1_batch(&logs);
tree.save();
metadata
};

let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(db);
let read_logs: Vec<_> = logs
.into_iter()
Expand Down Expand Up @@ -304,7 +304,7 @@ fn subtract_from_max_value(diff: u8) -> [u8; 32] {
#[test]
fn root_hash_compatibility() {
let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(db);
assert_eq!(
tree.root_hash(),
Expand Down Expand Up @@ -356,7 +356,7 @@ fn root_hash_compatibility() {
#[test]
fn process_block_idempotency_check() {
let temp_dir = TempDir::new().expect("failed to get temporary directory for RocksDB");
let rocks_db = RocksDB::new(temp_dir.as_ref(), false);
let rocks_db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new_lightweight(rocks_db);
let logs = gen_storage_logs();
let tree_metadata = tree.process_l1_batch(&logs);
Expand Down Expand Up @@ -419,7 +419,7 @@ fn witness_workflow() {
let logs = gen_storage_logs();
let (first_chunk, _) = logs.split_at(logs.len() / 2);

let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new(db);
let metadata = tree.process_l1_batch(first_chunk);
let job = metadata.witness.unwrap();
Expand Down Expand Up @@ -449,7 +449,7 @@ fn witnesses_with_multiple_blocks() {
let temp_dir = TempDir::new().expect("failed get temporary directory for RocksDB");
let logs = gen_storage_logs();

let db = RocksDB::new(temp_dir.as_ref(), false);
let db = RocksDB::new(temp_dir.as_ref());
let mut tree = ZkSyncTree::new(db);
let empty_tree_hashes: Vec<_> = (0..256)
.map(|i| Blake2Hasher.empty_subtree_hash(i))
Expand Down
3 changes: 1 addition & 2 deletions core/lib/state/src/rocksdb/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,8 @@ impl RocksdbStorage {

/// Creates a new storage with the provided RocksDB `path`.
pub fn new(path: &Path) -> Self {
let db = RocksDB::new(path, true);
Self {
db,
db: RocksDB::new(path),
pending_patch: InMemoryStorage::default(),
enum_index_migration_chunk_size: 0,
}
Expand Down
Loading