tests: update memcached memory configuration

Signed-off-by: Reto Achermann <[email protected]>

Author: achreto

kernel/tests/s11_rackscale_benchmarks.rs

@@ -840,6 +840,8 @@ fn rackscale_memcached_checkout() {
 #[test]
 #[cfg(not(feature = "baremetal"))]
 fn s11_rackscale_memcached_benchmark_sharded_linux() {
+    use std::fs::remove_file;
+
     let machine = Machine::determine();
     let out_dir_path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join("sharded-memcached");
     let is_smoke = cfg!(feature = "smoke");
@@ -870,7 +872,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
         }
     };
 
-    let timeout_ms = if is_smoke { 60_000 } else { 600_000 };
+    let timeout_ms = if is_smoke { 60_000 } else { 900_000 };
 
     fn run_benchmark_internal(config: &MemcachedShardedConfig, timeout_ms: u64) -> PtySession {
         Command::new("killall").args(&["memcached"]).status().ok();
@@ -893,7 +895,9 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
         let con_info = if config.protocol == "tcp" {
             format!("tcp://localhost:{}", 11211 + id)
         } else {
-            format!("unix://{}/memcached{}.sock", config.path.display(), id)
+            let pathname = config.path.join(format!("memcached{id}.sock"));
+            remove_file(pathname); // make sure the socket file is removed
+            format!("unix://{}", pathname.display())
         };
 
         let mut command = Command::new("bash");
@@ -994,8 +998,9 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
 
             config.num_threads = num_threads;
 
-            let _ = Command::new("killall").args(&["memcached"]).status();
-            let _ = Command::new("killall").args(&["memcached"]).status();
+            let _ = Command::new("killall")
+                .args(&["memcached", "-s", "SIGKILL"])
+                .status();
             let mut pty = run_benchmark_internal(&config, timeout_ms);
             let mut output = String::new();
             let res =
@@ -1020,8 +1025,9 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
                 println!("Memcached Sharded: {num_threads}x{num_nodes} with {protocol}");
 
                 // terminate the memcached instance
-                let _ = Command::new("killall").args(&["memcached"]).status();
-                let _ = Command::new("killall").args(&["memcached"]).status();
+                let _ = Command::new("killall")
+                    .args(&["memcached", "-s", "SIGKILL"])
+                    .status();
 
                 let mut memcached_ctrls = Vec::new();
                 for i in 0..num_nodes {
@@ -1085,12 +1091,16 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
                         let _ = Command::new("killall").args(&["memcached"]).status();
                     }
                 };
+
+                let _ = pty.process.kill(rexpect::process::signal::Signal::SIGKILL);
             }
         }
     }
 
     // terminate the memcached instance
-    let _ = Command::new("killall").args(&["memcached"]).status();
+    let _ = Command::new("killall")
+        .args(&["memcached", "-s", "SIGKILL"])
+        .status();
 }
 
 #[test]

kernel/testutils/src/configs.rs

@@ -1,5 +1,5 @@
 // Copyright © 2021 VMware, Inc. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR MIT
 
-pub const MEMCACHED_MEM_SIZE_MB: usize = 8 * 1024;
+pub const MEMCACHED_MEM_SIZE_MB: usize = 4 * 1024;
 pub const MEMCACHED_NUM_QUERIES: usize = 1_000_000;