fix(storage): fix lock time metrics (#16054)

risingwavelabs · Apr 9, 2024 · ed75502 · ed75502
1 parent 6f360ce
commit ed75502
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/docker/dashboards/risingwave-dev-dashboard.json b/docker/dashboards/risingwave-dev-dashboard.json
diff --git a/docker/dashboards/risingwave-user-dashboard.json b/docker/dashboards/risingwave-user-dashboard.json
diff --git a/grafana/risingwave-dev-dashboard.dashboard.py b/grafana/risingwave-dev-dashboard.dashboard.py
@@ -2718,9 +2718,9 @@ def section_hummock_manager(outer_panels):
                     [
                         *quantile(
                             lambda quantile, legend: panels.target(
-                                f"histogram_quantile({quantile}, sum(rate({metric('hummock_manager_lock_time_bucket')}[$__rate_interval])) by (le, lock_name, lock_type))",
+                                f"histogram_quantile({quantile}, sum(rate({metric('hummock_manager_lock_time_bucket')}[$__rate_interval])) by (le, method, lock_name, lock_type))",
                                 f"Lock Time p{legend}"
-                                + " - {{lock_type}} @ {{lock_name}}",
+                                + " - {{method}} @ {{lock_type}} @ {{lock_name}}",
                             ),
                             [50, 99, "max"],
                         ),

diff --git a/grafana/risingwave-dev-dashboard.json b/grafana/risingwave-dev-dashboard.json
diff --git a/grafana/risingwave-user-dashboard.json b/grafana/risingwave-user-dashboard.json
diff --git a/src/meta/src/hummock/manager/mod.rs b/src/meta/src/hummock/manager/mod.rs
@@ -872,6 +872,8 @@ impl HummockManager {
         let mut versioning_guard = write_lock!(self, versioning).await;
         let versioning = versioning_guard.deref_mut();
 
+        let _timer = start_measure_real_process_timer!(self);
+
         let mut current_version = versioning.current_version.clone();
         let start_time = Instant::now();
         let max_committed_epoch = current_version.max_committed_epoch;
@@ -1402,6 +1404,8 @@ impl HummockManager {
         // The compaction task is finished.
         let mut versioning_guard = write_lock!(self, versioning).await;
         let versioning = versioning_guard.deref_mut();
+        let _timer = start_measure_real_process_timer!(self);
+
         let mut current_version = versioning.current_version.clone();
         // purge stale compact_status
         for group_id in original_keys {