Skip to content

Fix SSHAttach.reuse_ports_lock() when no grep matches #1700

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
un-def merged 1 commit into from
Sep 18, 2024
Merged

Fix SSHAttach.reuse_ports_lock() when no grep matches #1700

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions src/dstack/_internal/core/services/ssh/attach.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def reuse_ports_lock(cls, run_name: str) -> Optional[PortsLock]:
output: bytes
if IS_WINDOWS:
filter_prefix = "powershell"
# This script always returns zero exit status.
output = subprocess.check_output(
[
"powershell",
Expand All @@ -47,10 +48,21 @@ def reuse_ports_lock(cls, run_name: str) -> Optional[PortsLock]:
else:
filter_prefix = "grep"
ps = subprocess.Popen(("ps", "-A", "-o", "command"), stdout=subprocess.PIPE)
output = subprocess.check_output(
["grep", "--", f"-S {control_sock_path}"], stdin=ps.stdout
cp = subprocess.run(
["grep", "-F", "--", f"-S {control_sock_path}"],
stdin=ps.stdout,
stdout=subprocess.PIPE,
)
ps.wait()
# From grep man page: "the exit status is 0 if a line is selected,
# 1 if no lines were selected, and 2 if an error occurred".
if cp.returncode == 1:
return None
if cp.returncode != 0:
raise SSHError(
f"Unexpected grep exit status {cp.returncode} while searching for ssh process"
)
output = cp.stdout
commands = list(
filter(lambda s: not s.startswith(filter_prefix), output.decode().strip().split("\n"))
)
Expand Down