[storage] change async commit queue length (aptos-labs#2357)

matt-am · Jul 31, 2022 · abea67d · abea67d
1 parent 656e0c9
commit abea67d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/storage/aptosdb/src/state_store/mod.rs b/storage/aptosdb/src/state_store/mod.rs
@@ -51,7 +51,7 @@ type StateValueBatch = aptos_jellyfish_merkle::StateValueBatch<StateKey, StateVa
 pub const MAX_VALUES_TO_FETCH_FOR_KEY_PREFIX: usize = 10_000;
 // We assume TARGET_SNAPSHOT_INTERVAL_IN_VERSION > block size.
 const MAX_WRITE_SETS_AFTER_SNAPSHOT: LeafCount = buffered_state::TARGET_SNAPSHOT_INTERVAL_IN_VERSION
-    * ((buffered_state::ASYNC_COMMIT_CHANNEL_BUFFER_SIZE + 2) * 2 - 1)
+    * (buffered_state::ASYNC_COMMIT_CHANNEL_BUFFER_SIZE + 2 + 1/*  Rendezvous channel */)
     * 2;
 
 #[derive(Debug)]

diff --git a/storage/aptosdb/src/state_store/state_snapshot_committer.rs b/storage/aptosdb/src/state_store/state_snapshot_committer.rs
@@ -4,7 +4,7 @@
 //! This file defines the state snapshot committer running in background thread within StateStore.
 
 use crate::state_merkle_db::StateMerkleDb;
-use crate::state_store::buffered_state::{CommitMessage, ASYNC_COMMIT_CHANNEL_BUFFER_SIZE};
+use crate::state_store::buffered_state::CommitMessage;
 use crate::state_store::state_merkle_batch_committer::{
     StateMerkleBatch, StateMerkleBatchCommitter,
 };
@@ -27,8 +27,9 @@ impl StateSnapshotCommitter {
         state_merkle_db: Arc<StateMerkleDb>,
         state_snapshot_commit_receiver: Receiver<CommitMessage<Arc<StateDelta>>>,
     ) -> Self {
+        // Rendezvous channel
         let (state_merkle_batch_commit_sender, state_merkle_batch_commit_receiver) =
-            mpsc::sync_channel(ASYNC_COMMIT_CHANNEL_BUFFER_SIZE as usize);
+            mpsc::sync_channel(0);
         let arc_state_merkle_db = Arc::clone(&state_merkle_db);
         let join_handle = std::thread::Builder::new()
             .name("state_merkle_batch_committer".to_string())