Handle new jobstats format (#69)

* Handle new jobstats format * Update lustrefs-exporter/src/jobstats.rs * Update lustrefs-exporter/src/jobstats.rs --------- Co-authored-by: Joe Grund <jgrund@whamcloud.io>
whamcloud · Aug 8, 2024 · bf6a96c · bf6a96c
1 parent cf16c26
commit bf6a96c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/lustrefs-exporter/fixtures/jobstats_only/2.14.0_162.txt b/lustrefs-exporter/fixtures/jobstats_only/2.14.0_162.txt
diff --git a/lustrefs-exporter/src/jobstats.rs b/lustrefs-exporter/src/jobstats.rs
@@ -83,7 +83,11 @@ pub fn jobstats_stream<R: BufRead + std::marker::Send + 'static>(
         let line = maybe_line?;
 
         match state {
-            _ if line == "job_stats:" || line.starts_with("  snapshot_time:") => {
+            _ if line == "job_stats:"
+                || line.starts_with("  start_time:")
+                || line.starts_with("  elapsed_time:")
+                || line.starts_with("  snapshot_time:") =>
+            {
                 return Ok((state, LoopInstruction::Noop))
             }
             State::Empty if line.starts_with("obdfilter") || line.starts_with("mdt.") => {
@@ -118,7 +122,6 @@ pub fn jobstats_stream<R: BufRead + std::marker::Send + 'static>(
             }
             x => {
                 tracing::debug!("Unexpected line: {line}, state: {x:?}");
-
                 return Ok((x, LoopInstruction::Return));
             }
         }
@@ -352,6 +355,25 @@ pub mod tests {
         assert_eq!(cnt, 5_310_036);
     }
 
+    #[tokio::test(flavor = "multi_thread")]
+    async fn parse_new_yaml() {
+        let f = File::open("fixtures/jobstats_only/2.14.0_162.txt").unwrap();
+
+        let f = BufReader::with_capacity(128 * 1_024, f);
+
+        let (fut, mut rx) = jobstats_stream(f);
+
+        let mut cnt = 0;
+
+        while rx.recv().await.is_some() {
+            cnt += 1;
+        }
+
+        fut.await.unwrap();
+
+        assert_eq!(cnt, 1_728);
+    }
+
     const JOBSTAT_JOB: &str = r#"
 - job_id:          "FAKE_JOB"
   snapshot_time:   1720516680