Skip to content

Fix a race condition in dmypy #5956

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
merged 2 commits into from
Nov 27, 2018
Merged

Fix a race condition in dmypy #5956

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0490f7
Fix a race condition in dmypy
msullivan Nov 26, 2018
4ae4839
comment tweak
msullivan Nov 27, 2018
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
14 changes: 13 additions & 1 deletion mypy/dmypy_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ def __init__(self, options: Options,

def serve(self) -> None:
"""Serve requests, synchronously (no thread or fork)."""
command = None
try:
sock = self.create_listening_socket()
if self.timeout is not None:
Expand Down Expand Up @@ -200,7 +201,13 @@ def serve(self) -> None:
reset_global_state()
sys.exit(0)
finally:
os.unlink(STATUS_FILE)
# If the final command is something other than a clean
# stop, remove the status file. (We can't just
# simplify the logic and always remove the file, since
# that could cause us to remove a future server's
# status file.)
if command != 'stop':
os.unlink(STATUS_FILE)
finally:
shutil.rmtree(self.sock_directory)
exc_info = sys.exc_info()
Expand Down Expand Up @@ -235,6 +242,11 @@ def cmd_status(self) -> Dict[str, object]:

def cmd_stop(self) -> Dict[str, object]:
"""Stop daemon."""
# We need to remove the status file *before* we complete the
# RPC. Otherwise a race condition exists where a subsequent
# command can see a status file from a dying server and think
# it is a live one.
os.unlink(STATUS_FILE)
return {}

def cmd_run(self, version: str, args: Sequence[str]) -> Dict[str, object]:
Expand Down