Merge pull request ceph#56888 from rishabh-d-dave/vstart-runnner-timeout

qa/vstart_runner: don't let command run after timeout

Reviewed-by: Venky Shankar <[email protected]>

Author: rishabh-d-dave

qa/tasks/vstart_runner.py

@@ -233,7 +233,7 @@ def _write_stderr(self, err):
         else:
             self.stderr.write(err)
 
-    def wait(self):
+    def wait(self, timeout=None):
         # Null subproc.stdin so communicate() does not try flushing/closing it
         # again.
         if self.stdin is not None and self.stdin.closed:
@@ -249,7 +249,7 @@ def wait(self):
             else:
                 return
 
-        out, err = self.subproc.communicate()
+        out, err = self.subproc.communicate(timeout=timeout)
         out, err = rm_nonascii_chars(out), rm_nonascii_chars(err)
         self._write_stdout(out)
         self._write_stderr(err)
@@ -488,7 +488,7 @@ def _do_run(self, args, check_status=True, wait=True, stdout=None,
         )
 
         if wait:
-            proc.wait()
+            proc.wait(timeout)
 
         return proc
 
@@ -1399,7 +1399,7 @@ def exec_test():
         log.info('\nrunning vstart.sh now...')
         # usually, i get vstart.sh running completely in less than 100
         # seconds.
-        remote.run(args=args, env=vstart_env, timeout=(3 * 60))
+        remote.run(args=args, env=vstart_env, timeout=(5 * 60))
         log.info('\nvstart.sh finished running')
 
         # Wait for OSD to come up so that subsequent injectargs etc will