remove extraneous async from observer functions

Author: aschran

crates/sui-core/src/authority/execution_time_estimator.rs

@@ -127,8 +127,7 @@ impl ExecutionTimeObserver {
                     }
                     Some((tx, timings, total_duration)) = rx_local_execution_time.recv() => {
                         observer
-                            .record_local_observations(&tx, &timings, total_duration)
-                            .await;
+                            .record_local_observations(&tx, &timings, total_duration);
                     }
                     else => { break }
                 }
@@ -173,7 +172,7 @@ impl ExecutionTimeObserver {
     // Updates moving averages and submits observation to consensus if local observation differs
     // from consensus median.
     // TODO: Consider more detailed heuristic to account for overhead outside of commands.
-    async fn record_local_observations(
+    fn record_local_observations(
         &mut self,
         tx: &ProgrammableTransaction,
         timings: &[ExecutionTiming],
@@ -320,10 +319,10 @@ impl ExecutionTimeObserver {
         }
 
         // Share new observations.
-        self.share_observations(to_share).await;
+        self.share_observations(to_share);
     }
 
-    async fn share_observations(&mut self, to_share: Vec<(ExecutionTimeObservationKey, Duration)>) {
+    fn share_observations(&mut self, to_share: Vec<(ExecutionTimeObservationKey, Duration)>) {
         if to_share.is_empty() {
             return;
         }
@@ -670,9 +669,7 @@ mod tests {
         // Record an observation
         let timings = vec![ExecutionTiming::Success(Duration::from_millis(100))];
         let total_duration = Duration::from_millis(110);
-        observer
-            .record_local_observations(&ptb, &timings, total_duration)
-            .await;
+        observer.record_local_observations(&ptb, &timings, total_duration);
 
         let key = ExecutionTimeObservationKey::MoveEntryPoint {
             package,
@@ -693,9 +690,7 @@ mod tests {
         // Record another observation
         let timings = vec![ExecutionTiming::Success(Duration::from_millis(110))];
         let total_duration = Duration::from_millis(120);
-        observer
-            .record_local_observations(&ptb, &timings, total_duration)
-            .await;
+        observer.record_local_observations(&ptb, &timings, total_duration);
 
         // Check that moving average was updated
         let local_obs = observer.local_observations.get(&key).unwrap();
@@ -710,9 +705,7 @@ mod tests {
         // Record another observation
         let timings = vec![ExecutionTiming::Success(Duration::from_millis(120))];
         let total_duration = Duration::from_millis(130);
-        observer
-            .record_local_observations(&ptb, &timings, total_duration)
-            .await;
+        observer.record_local_observations(&ptb, &timings, total_duration);
 
         // Check that moving average was updated
         let local_obs = observer.local_observations.get(&key).unwrap();
@@ -738,9 +731,7 @@ mod tests {
         // Record last observation
         let timings = vec![ExecutionTiming::Success(Duration::from_millis(120))];
         let total_duration = Duration::from_millis(120);
-        observer
-            .record_local_observations(&ptb, &timings, total_duration)
-            .await;
+        observer.record_local_observations(&ptb, &timings, total_duration);
 
         // Verify that moving average is the same and a new observation was shared, as
         // enough time has now elapsed
@@ -818,9 +809,7 @@ mod tests {
             ExecutionTiming::Success(Duration::from_millis(50)),
         ];
         let total_duration = Duration::from_millis(180);
-        observer
-            .record_local_observations(&ptb, &timings, total_duration)
-            .await;
+        observer.record_local_observations(&ptb, &timings, total_duration);
 
         // Check that both commands were recorded
         let move_key = ExecutionTimeObservationKey::MoveEntryPoint {
@@ -917,9 +906,7 @@ mod tests {
 
         // First observation - should not share due to low utilization
         let timings = vec![ExecutionTiming::Success(Duration::from_secs(1))];
-        observer
-            .record_local_observations(&ptb, &timings, Duration::from_secs(2))
-            .await;
+        observer.record_local_observations(&ptb, &timings, Duration::from_secs(2));
         assert!(observer
             .local_observations
             .get(&key)
@@ -929,9 +916,7 @@ mod tests {
 
         // Second observation - no time has passed, so now utilization is high; should share
         let timings = vec![ExecutionTiming::Success(Duration::from_secs(1))];
-        observer
-            .record_local_observations(&ptb, &timings, Duration::from_secs(2))
-            .await;
+        observer.record_local_observations(&ptb, &timings, Duration::from_secs(2));
         assert_eq!(
             observer
                 .local_observations
@@ -947,9 +932,7 @@ mod tests {
         // when accounting for the new observation; should share
         tokio::time::advance(Duration::from_secs(5)).await;
         let timings = vec![ExecutionTiming::Success(Duration::from_secs(3))];
-        observer
-            .record_local_observations(&ptb, &timings, Duration::from_secs(5))
-            .await;
+        observer.record_local_observations(&ptb, &timings, Duration::from_secs(5));
         assert_eq!(
             observer
                 .local_observations
@@ -964,9 +947,7 @@ mod tests {
         // Fourth execution after utilization drops - should not share, even though diff still high
         tokio::time::advance(Duration::from_secs(60)).await;
         let timings = vec![ExecutionTiming::Success(Duration::from_secs(11))];
-        observer
-            .record_local_observations(&ptb, &timings, Duration::from_secs(11))
-            .await;
+        observer.record_local_observations(&ptb, &timings, Duration::from_secs(11));
         assert_eq!(
             observer
                 .local_observations

crates/sui-core/src/epoch/epoch_metrics.rs

@@ -114,7 +114,7 @@ pub struct EpochMetrics {
     /// The number of cached indebted objects in the execution time observer.
     pub epoch_execution_time_observer_indebted_objects: IntGauge,
 
-    /// The number of objects tracked by the object utilization cache.
+    /// The number of objects tracked by the object utilieation cache.
     pub epoch_execution_time_observer_utilization_cache_size: IntGauge,
 
     /// The number of objects determined by the execution time observer to be overutilized.