Skip to content

enable non-blocking reads for streaming outputs #4755

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

Merged
boegel merged 7 commits into from
Feb 8, 2025
Merged

enable non-blocking reads for streaming outputs #4755

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
67506d6
enable non-blocking reads for streaming outputs
lexming Feb 6, 2025
babd817
use same non-blocking mechanism for streaming and QA runs
lexming Feb 6, 2025
cda7bd9
collect streaming output line by line and decode it to debug logs
lexming Feb 6, 2025
95a41d6
remove leftover print message about streaming output of command, this…
lexming Feb 7, 2025
8dd9cc5
update expected string in output of test_run_shell_cmd_stream
lexming Feb 7, 2025
d509595
remove assert on old print message about streaming output
lexming Feb 7, 2025
a3a8b33
minor code style improvement in run_shell_cmd to enable non-blocking …
boegel Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions easybuild/tools/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,6 @@ def to_cmd_str(cmd):
if not hidden:
_cmd_trace_msg(cmd_str, start_time, work_dir, stdin, tmpdir, thread_id, interactive=interactive)

if stream_output:
print_msg(f"(streaming) output for command '{cmd_str}':")

# use bash as shell instead of the default /bin/sh used by subprocess.run
# (which could be dash instead of bash, like on Ubuntu, see https://wiki.ubuntu.com/DashAsBinSh)
# stick to None (default value) when not running command via a shell
Expand Down Expand Up @@ -512,6 +509,13 @@ def to_cmd_str(cmd):

if stream_output or qa_patterns:

if stream_output:
# enable non-blocking reading of output
print_msg(f"(streaming) output for command '{cmd_str}':")
os.set_blocking(proc.stdout.fileno(), False)
if split_stderr:
os.set_blocking(proc.stderr.fileno(), False)

if qa_patterns:
# make stdout, stderr, stdin non-blocking files
channels = [proc.stdout, proc.stdin]
Expand Down