tests: increase timeout for sharded nros

Signed-off-by: Reto Achermann <[email protected]>
vmware-labs · Oct 19, 2023 · dbdcd6e · dbdcd6e
1 parent 8d5b991
commit dbdcd6e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/kernel/tests/s11_rackscale_benchmarks.rs b/kernel/tests/s11_rackscale_benchmarks.rs
@@ -842,6 +842,8 @@ fn rackscale_memcached_checkout() {
 fn s11_rackscale_memcached_benchmark_sharded_linux() {
     use std::fs::remove_file;
 
+    use rexpect::process::signal::Signal::SIGKILL;
+
     let machine = Machine::determine();
     let out_dir_path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join("sharded-memcached");
     let is_smoke = cfg!(feature = "smoke");
@@ -893,7 +895,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
         timeout_ms: u64,
     ) -> Result<PtySession> {
         let con_info = if config.protocol == "tcp" {
-            format!("tcp://localhost:{}", 11211 + id)
+            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
@@ -941,7 +943,7 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
             }
             if config.protocol == "tcp" {
                 if config.is_local_host {
-                    servers.push_str(format!("tcp://localhost:{}", 11211 + i).as_str());
+                    servers.push_str(format!("tcp://localhost:{}", 11212 + i).as_str());
                 } else {
                     // +1 because tap0 is reserved for the controller.
                     let ip = 10 + i + 1;
@@ -1014,6 +1016,9 @@ 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);
+
+
             println!("{:?}", res);
 
             // single node
@@ -1029,6 +1034,9 @@ fn s11_rackscale_memcached_benchmark_sharded_linux() {
                     .args(&["memcached", "-s", "SIGKILL"])
                     .status();
 
+                // give some time so memcached can be cleaned up
+                std::thread::sleep(Duration::from_secs(5));
+
                 let mut memcached_ctrls = Vec::new();
                 for i in 0..num_nodes {
                     memcached_ctrls.push(
@@ -1344,7 +1352,7 @@ fn s11_rackscale_memcached_benchmark_sharded_nros() {
     }
 
     fn rackscale_timeout_fn(num_cores: usize) -> u64 {
-        600_000 + 60_000 * num_cores as u64
+        1200_000 + 60_000 * num_cores as u64
     }
 
     fn mem_fn(num_cores: usize, _num_clients: usize, is_smoke: bool) -> usize {