[Storage] Use gauged api to measure latency.

Closes: aptos-labs#704
vdovaT · Apr 29, 2022 · 12eae22 · 12eae22
1 parent 7ffedbe
commit 12eae22
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/state-sync/state-sync-v2/state-sync-driver/src/tests/mocks.rs b/state-sync/state-sync-v2/state-sync-driver/src/tests/mocks.rs
@@ -285,7 +285,7 @@ mock! {
             chunk_size: usize,
         ) -> Result<StateValueChunkWithProof>;
 
-        fn get_state_prune_window(&self) -> Option<usize>;
+        fn get_state_prune_window(&self) -> Result<Option<usize>>;
     }
 }
 

diff --git a/state-sync/storage-service/server/src/lib.rs b/state-sync/storage-service/server/src/lib.rs
@@ -454,6 +454,7 @@ impl StorageReader {
         let pruning_window = self
             .storage
             .get_state_prune_window()
+            .map_err(|error| Error::StorageErrorEncountered(error.to_string()))?
             .map(|window| window as u64);
         if let Some(pruning_window) = pruning_window {
             if latest_version > pruning_window {

diff --git a/state-sync/storage-service/server/src/tests.rs b/state-sync/storage-service/server/src/tests.rs
@@ -766,8 +766,8 @@ impl DbReader for MockDbReader {
         Ok(account_states_chunk_with_proof)
     }
 
-    fn get_state_prune_window(&self) -> Option<usize> {
-        Some(STATE_PRUNE_WINDOW as usize)
+    fn get_state_prune_window(&self) -> Result<Option<usize>> {
+        Ok(Some(STATE_PRUNE_WINDOW as usize))
     }
 }
 

diff --git a/storage/aptosdb/src/lib.rs b/storage/aptosdb/src/lib.rs
@@ -736,10 +736,12 @@ impl DbReader for AptosDB {
         ledger_version: Version,
         fetch_events: bool,
     ) -> Result<Option<TransactionWithProof>> {
-        self.transaction_store
-            .get_transaction_version_by_hash(&hash, ledger_version)?
-            .map(|v| self.get_transaction_with_proof(v, ledger_version, fetch_events))
-            .transpose()
+        gauged_api("get_transaction_by_hash", || {
+            self.transaction_store
+                .get_transaction_version_by_hash(&hash, ledger_version)?
+                .map(|v| self.get_transaction_with_proof(v, ledger_version, fetch_events))
+                .transpose()
+        })
     }
 
     /// Get transaction by version, delegates to `AptosDB::get_transaction_by_hash`
@@ -749,7 +751,9 @@ impl DbReader for AptosDB {
         ledger_version: Version,
         fetch_events: bool,
     ) -> Result<TransactionWithProof> {
-        self.get_transaction_with_proof(version, ledger_version, fetch_events)
+        gauged_api("get_transaction_by_version", || {
+            self.get_transaction_with_proof(version, ledger_version, fetch_events)
+        })
     }
 
     // ======================= State Synchronizer Internal APIs ===================================
@@ -807,12 +811,16 @@ impl DbReader for AptosDB {
 
     /// Get the first version that txn starts existent.
     fn get_first_txn_version(&self) -> Result<Option<Version>> {
-        self.transaction_store.get_first_txn_version()
+        gauged_api("get_first_txn_version", || {
+            self.transaction_store.get_first_txn_version()
+        })
     }
 
     /// Get the first version that write set starts existent.
     fn get_first_write_set_version(&self) -> Result<Option<Version>> {
-        self.transaction_store.get_first_write_set_version()
+        gauged_api("get_first_write_set_version", || {
+            self.transaction_store.get_first_write_set_version()
+        })
     }
 
     /// Gets a batch of transactions for the purpose of synchronizing state to another node.
@@ -1190,10 +1198,13 @@ impl DbReader for AptosDB {
         })
     }
 
-    fn get_state_prune_window(&self) -> Option<usize> {
-        self.pruner
-            .as_ref()
-            .map(|x| x.get_state_store_pruner_window() as usize)
+    fn get_state_prune_window(&self) -> Result<Option<usize>> {
+        gauged_api("get_state_prune_window", || {
+            Ok(self
+                .pruner
+                .as_ref()
+                .map(|x| x.get_state_store_pruner_window() as usize))
+        })
     }
 }
 

diff --git a/storage/storage-interface/src/lib.rs b/storage/storage-interface/src/lib.rs
@@ -510,7 +510,7 @@ pub trait DbReader: Send + Sync {
     }
 
     /// Get the state prune window config value.
-    fn get_state_prune_window(&self) -> Option<usize> {
+    fn get_state_prune_window(&self) -> Result<Option<usize>> {
         unimplemented!()
     }
 }