Skip to content

notebook: don’t filter polled instances by PID #4407

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
wchargin merged 1 commit into from
Dec 1, 2020
Merged

notebook: don’t filter polled instances by PID #4407

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
17 changes: 8 additions & 9 deletions tensorboard/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,13 +393,10 @@ def start(arguments, timeout=datetime.timedelta(seconds=60)):
A `StartReused`, `StartLaunched`, `StartFailed`, or `StartTimedOut`
object.
"""
match = _find_matching_instance(
cache_key(
working_directory=os.getcwd(),
arguments=arguments,
configure_kwargs={},
),
this_cache_key = cache_key(
working_directory=os.getcwd(), arguments=arguments, configure_kwargs={},
)
match = _find_matching_instance(this_cache_key)
if match:
return StartReused(info=match)

Expand Down Expand Up @@ -430,9 +427,11 @@ def start(arguments, timeout=datetime.timedelta(seconds=60)):
stdout=_maybe_read_file(stdout_path),
stderr=_maybe_read_file(stderr_path),
)
for info in get_all():
if info.pid == p.pid and info.start_time >= start_time_seconds:
return StartLaunched(info=info)
info = _find_matching_instance(this_cache_key)
if info:
# Don't check that `info.pid == p.pid`, since on Windows that may
# not be the case: see #4300.
return StartLaunched(info=info)
else:
return StartTimedOut(pid=p.pid)

Expand Down