Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Apr 17, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bc23e5
qa/vstart_runner: don't let command run after timeout
rishabh-d-dave Apr 3, 2024
03b3329
qa/vstart_runner: allow more time for vstart.sh to run
rishabh-d-dave Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions qa/tasks/vstart_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -1392,7 +1392,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
Expand Down