correctly set timeout in rackscale runner

Signed-off-by: Reto Achermann <[email protected]>
vmware-labs · Nov 28, 2023 · bf776d4 · bf776d4
1 parent 82c757d
commit bf776d4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/kernel/tests/s11_rackscale_benchmarks.rs b/kernel/tests/s11_rackscale_benchmarks.rs
@@ -618,7 +618,7 @@ fn rackscale_memcached_internal_benchmark(transport: RackscaleTransport) {
         if cfg!(feature = "smoke") {
             60_000 as u64
         } else {
-            (MEMCACHED_MEM_SIZE_MB / 10 * 1000 + MEMCACHED_NUM_QUERIES) as u64
+            ((MEMCACHED_MEM_SIZE_MB / 10 + MEMCACHED_NUM_QUERIES) * 1000) as u64
         }
     }
 

diff --git a/kernel/testutils/src/memcached.rs b/kernel/testutils/src/memcached.rs
@@ -40,15 +40,15 @@ pub struct MemcachedResult {
 pub fn parse_memcached_output(p: &mut PtySession, output: &mut String) -> Result<MemcachedResult> {
     // x_benchmark_mem = 10 MB
     let (prev, matched) = p.exp_regex(r#"x_benchmark_mem = (\d+) MB"#)?;
-    // println!("> {}", matched);
+    println!("> {}", matched);
     let b_mem = matched.replace("x_benchmark_mem = ", "").replace(" MB", "");
 
     *output += prev.as_str();
     *output += matched.as_str();
 
     // number of threads: 3
     let (prev, matched) = p.exp_regex(r#"number of threads: (\d+)"#)?;
-    // println!("> {}", matched);
+    println!("> {}", matched);
     let b_threads = matched.replace("number of threads: ", "");
 
     *output += prev.as_str();

diff --git a/kernel/testutils/src/rackscale_runner.rs b/kernel/testutils/src/rackscale_runner.rs
@@ -872,9 +872,6 @@ impl<T: Clone + Send + 'static> RackscaleBench<T> {
             test_run.cores_per_client = cores_per_client;
             test_run.num_clients = num_clients;
 
-            // Set controller timeout for this test
-            test_run.controller_timeout = test_run.client_timeout;
-
             // Calculate command based on the number of cores
             test_run.cmd = (self.cmd_fn)(total_cores, num_clients, test_run.arg.clone());
 
@@ -885,11 +882,17 @@ impl<T: Clone + Send + 'static> RackscaleBench<T> {
                 test_run.memory = (self.mem_fn)(total_cores, cores_per_client, is_smoke)
                     + test_run.shmem_size * test_run.num_clients;
 
+                // Set controller timeout for this test
+                test_run.controller_timeout = test_run.client_timeout;
+
                 test_run.run_baseline();
             } else {
                 test_run.client_timeout = (self.rackscale_timeout_fn)(total_cores);
                 test_run.memory = (self.mem_fn)(total_cores, cores_per_client, is_smoke) / test_run.num_clients;
 
+                // Set controller timeout for this test
+                test_run.controller_timeout = test_run.client_timeout;
+
                 test_run.run_rackscale();
             }
 

diff --git a/kernel/testutils/src/runner_args.rs b/kernel/testutils/src/runner_args.rs
@@ -641,6 +641,7 @@ pub fn wait_for_sigterm_or_successful_exit_no_log(
             use rexpect::errors::ErrorKind::Timeout;
             match e {
                 Error(Timeout(expected, got, _timeout), _st) => {
+                    println!("Timeout");
                     println!("Expected: `{expected}`\n");
                     println!("Got:",);
                     let count = got.lines().count();