fix metrics

Signed-off-by: Little-Wallace <[email protected]>

grafana/risingwave-dashboard.dashboard.py

@@ -645,7 +645,7 @@ def section_compaction(outer_panels):
                             [90, "max"],
                         ),
                         panels.target(
-                            f"histogram_quantile(0.99, sum(rate({metric('compute_apply_version_duration_bucket')}[$__rate_interval])) by (le, instance))",
+                            f"histogram_quantile(0.99, sum(rate({metric('compute_refill_cache_duration_bucket')}[$__rate_interval])) by (le, instance))",
                             "compute_apply_version_duration_p99 - {{instance}}",
                         ),
                         panels.target(

src/storage/src/hummock/event_handler/cache_refill_policy.rs

@@ -44,6 +44,7 @@ impl CacheRefillPolicy {
         if self.max_preload_wait_time_mill > 0 {
             let policy = self.clone();
             let handle = tokio::spawn(async move {
+                let timer = policy.metrics.refill_cache_duration.start_timer();
                 let mut preload_count = 0;
                 let stats = StoreLocalStatistic::default();
                 let mut flatten_reqs = Vec::new();
@@ -73,6 +74,7 @@ impl CacheRefillPolicy {
                 }
                 policy.metrics.preload_io_count.inc_by(preload_count as u64);
                 let _ = try_join_all(flatten_reqs).await;
+                timer.observe_duration();
             });
             let _ = tokio::time::timeout(
                 Duration::from_millis(self.max_preload_wait_time_mill),

src/storage/src/hummock/event_handler/hummock_event_handler.rs

@@ -159,7 +159,7 @@ impl HummockEventHandler {
         );
         let cache_fill_policy = Arc::new(CacheRefillPolicy::new(
             sstable_store,
-            metrics.clone(),
+            metrics,
             max_preload_wait_time_mill,
         ));
 

src/storage/src/monitor/compactor_metrics.rs

@@ -44,7 +44,7 @@ pub struct CompactorMetrics {
     pub write_build_l0_bytes: GenericCounter<AtomicU64>,
     pub sstable_distinct_epoch_count: Histogram,
     pub preload_io_count: GenericCounter<AtomicU64>,
-    pub apply_version_duration: Histogram,
+    pub refill_cache_duration: Histogram,
 }
 
 impl CompactorMetrics {
@@ -85,11 +85,11 @@ impl CompactorMetrics {
         let get_table_id_total_time_duration =
             register_histogram_with_registry!(opts, registry).unwrap();
         let opts = histogram_opts!(
-            "compute_apply_version_duration",
+            "compute_refill_cache_duration",
             "Total time of compact that have been issued to state store",
             exponential_buckets(0.001, 1.6, 20).unwrap() // max 520s
         );
-        let apply_version_duration = register_histogram_with_registry!(opts, registry).unwrap();
+        let refill_cache_duration = register_histogram_with_registry!(opts, registry).unwrap();
         let opts = histogram_opts!(
             "compactor_remote_read_time",
             "Total time of operations which read from remote storage when enable prefetch",
@@ -244,7 +244,7 @@ impl CompactorMetrics {
             write_build_l0_bytes,
             sstable_distinct_epoch_count,
             preload_io_count,
-            apply_version_duration,
+            refill_cache_duration,
         }
     }