fix(grafana): fix metrics

risingwavelabs · Mar 27, 2023 · 1ee68d0 · 1ee68d0
1 parent ed41e85
commit 1ee68d0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/grafana/risingwave-dashboard.dashboard.py b/grafana/risingwave-dashboard.dashboard.py
@@ -692,7 +692,7 @@ def section_compaction(outer_panels):
                     "num of SSTs written into next level during history compactions to next level",
                     [
                         panels.target(
-                            f"sum({metric('storage_level_compact_write')}) / sum({metric('state_store_write_build_l0_bytes')})",
+                            f"sum({metric('storage_level_compact_write')}) / sum({metric('compactor_write_build_l0_bytes')})",
                             "write amplification",
                         ),
                     ],
@@ -718,7 +718,7 @@ def section_compaction(outer_panels):
                     "",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_read_next')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_read_next')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} read",
                         ),
                     ],
@@ -728,7 +728,7 @@ def section_compaction(outer_panels):
                     "",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_read_curr')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_read_curr')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} read",
                         ),
                     ],
@@ -738,7 +738,7 @@ def section_compaction(outer_panels):
                     "",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_read_sstn_curr')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_read_sstn_curr')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} read",
                         ),
                     ],
@@ -748,7 +748,7 @@ def section_compaction(outer_panels):
                     "",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_write')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_write')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} write",
                         ),
                     ],
@@ -758,7 +758,7 @@ def section_compaction(outer_panels):
                     "",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_write_sstn')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_write_sstn')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} write",
                         ),
                     ],
@@ -768,7 +768,7 @@ def section_compaction(outer_panels):
                     "num of SSTs read from next level during history compactions to next level",
                     [
                         panels.target(
-                            f"sum(rate({metric('storage_level_compact_read_sstn_next')}[$__rate_interval])) by (le, level_index)",
+                            f"sum(rate({metric('storage_level_compact_read_sstn_next')}[$__rate_interval])) by (le, group, level_index)",
                             "cg{{group}}-L{{level_index}} read",
                         ),
                     ],

diff --git a/grafana/risingwave-dashboard.json b/grafana/risingwave-dashboard.json
diff --git a/src/ctl/src/cmd_impl/hummock/list_version.rs b/src/ctl/src/cmd_impl/hummock/list_version.rs
@@ -20,18 +20,6 @@ use crate::CtlContext;
 pub async fn list_version(context: &CtlContext) -> anyhow::Result<()> {
     let meta_client = context.meta_client().await?;
     let version = meta_client.get_current_version().await?;
-
-    // for (cg, levels) in &version.levels {
-
-    //     if let Some(l0) = levels.l0 {
-
-    //     } else {
-    //         for level in &levels.levels {
-
-    //         }
-    //     }
-    // }
-
     println!("{:#?}", version);
     Ok(())
 }

diff --git a/src/meta/src/hummock/metrics_utils.rs b/src/meta/src/hummock/metrics_utils.rs
@@ -115,6 +115,10 @@ pub fn trigger_sst_stat(
                     continue;
                 }
 
+                if idx != 0 && idx == task.target_level as usize {
+                    continue;
+                }
+
                 let key = (idx, task.target_level as usize);
                 let count = compacting_task_stat.entry(key).or_insert(0);
                 *count += 1;
@@ -124,8 +128,7 @@ pub fn trigger_sst_stat(
         }
     }
 
-    tracing::info!("LSM Compacting STAT {:?}", compacting_task_stat);
-
+    tracing::debug!("LSM Compacting STAT {:?}", compacting_task_stat);
     for ((select, target), compacting_task_count) in compacting_task_stat {
         let label_str = format!("cg{} L{} -> L{}", compaction_group_id, select, target);
         metrics