Update memcache-bench git hash, detect memory allocation failures in memcached output, clean up compilation warnings

Author: hunhoffe

kernel/tests/s11_rackscale_benchmarks.rs

@@ -758,13 +758,18 @@ fn parse_memcached_output(
     *output += prev.as_str();
     *output += matched.as_str();
 
-    Ok(MemcachedShardedResult {
-        b_threads,
-        b_mem,
-        b_queries,
-        b_time,
-        b_thpt,
-    })
+    if output.contains("MEMORY ALLOCATION FAILURE") {
+        println!("Detected memory allocation error in memcached output");
+        Err("Memory allocation failure".into())
+    } else {
+        Ok(MemcachedShardedResult {
+            b_threads,
+            b_mem,
+            b_queries,
+            b_time,
+            b_thpt,
+        })
+    }
 }
 
 #[cfg(not(feature = "baremetal"))]
@@ -804,12 +809,12 @@ fn rackscale_memcached_checkout() {
     }
 
     println!(
-        "CHECKOUT 0d90d53b99c3890b6e47efe08446e5180711ff09 {:?}",
+        "CHECKOUT e585c23e578d79b18d703b06f26b6e10a502d129 {:?}",
         out_dir
     );
 
     let res = Command::new("git")
-        .args(&["checkout", "0d90d53b99c3890b6e47efe08446e5180711ff09"])
+        .args(&["checkout", "e585c23e578d79b18d703b06f26b6e10a502d129"])
         .current_dir(out_dir_path.as_path())
         .output()
         .expect("git checkout failed");
@@ -902,7 +907,9 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
             format!("tcp://localhost:{}", 11212 + id)
         } else {
             let pathname = config.path.join(format!("memcached{id}.sock"));
-            remove_file(pathname.clone()); // make sure the socket file is removed
+            if pathname.is_file() {
+                remove_file(pathname.clone()).expect("Failed to remove path"); // make sure the socket file is removed
+            }
             format!("unix://{}", pathname.display())
         };
 
@@ -1020,7 +1027,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
             let r = csv_file.write(out.as_bytes());
             assert!(r.is_ok());
 
-            let r = pty.process.kill(SIGKILL);
+            let _r = pty.process.kill(SIGKILL);
 
             // single node
             for protocol in &["tcp", "unix"] {
@@ -1073,11 +1080,11 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
                             println!("Timeout while waiting for {} ms\n", timeout.as_millis());
                             println!("Expected: `{expected}`\n");
                             println!("Got:",);
-                            for l in got.lines().take(5) {
+                            for l in got.lines().take(20) {
                                 println!(" > {l}");
                             }
                         } else {
-                            println!("error: {}", e);
+                            panic!("error: {}", e);
                         }
 
                         let r = csv_file.write(format!("{},", env!("GIT_HASH")).as_bytes());
@@ -1379,7 +1386,9 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
     };
     bench.run_bench(false, is_smoke);
     for mut ping in pings.into_iter() {
-        ping.process.kill(SIGKILL);
+        if !ping.process.kill(SIGKILL).is_ok() {
+            println!("Failed to kill ping process");
+        }
     }
 }
 

kernel/testutils/src/rackscale_runner.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::mpsc::{Receiver, Sender, TryRecvError};
 use std::sync::{mpsc::channel, Arc, Mutex};
-use std::thread::{self, sleep};
+use std::thread;
 use std::time::Duration;
 
 use rexpect::errors::*;

kernel/testutils/src/runner_args.rs

@@ -638,10 +638,9 @@ pub fn wait_for_sigterm_or_successful_exit_no_log(
         Err(e) => {
             log_qemu_args(args);
             println!("Qemu testing failed: {} ", name);
-            use rexpect::errors::Error;
             use rexpect::errors::ErrorKind::Timeout;
             match e {
-                Error(Timeout(expected, got, timeout), st) => {
+                Error(Timeout(expected, got, _timeout), _st) => {
                     println!("Expected: `{expected}`\n");
                     println!("Got:",);
                     let count = got.lines().count();