Repository navigation
fix: wait for Mooncake master exit before replacement #213
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.
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
Open
ji-huazhong
wants to merge
1
commit into
Ascend:main
Choose a base branch
from
ji-huazhong:fix/mooncake-master-restart
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| # Copyright 2026 The TransferQueue Team | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| """A replacement master must wait for the previous listener to release its port.""" | ||
|
|
||
| import socket | ||
| import subprocess | ||
| import sys | ||
| from pathlib import Path | ||
|
|
||
| import psutil | ||
| import pytest | ||
| from omegaconf import OmegaConf | ||
|
|
||
| from transfer_queue.storage.bootstrap import mooncake_bootstrap | ||
|
|
||
|
|
||
| @pytest.mark.parametrize("non_child", [False, True], ids=["own-child", "other-parent"]) | ||
| @pytest.mark.parametrize("ignore_term", [False, True], ids=["delayed-exit", "forced-exit"]) | ||
| def test_replacement_waits_for_old_listener(monkeypatch, ignore_term, non_child): | ||
| if non_child and sys.platform != "linux": | ||
| pytest.skip("Non-child zombie regression requires Linux") | ||
| script = """ | ||
| import signal, socket, sys, time | ||
| listener = socket.socket() | ||
| listener.bind(("127.0.0.1", 0)) | ||
| listener.listen() | ||
| def stop(*args): | ||
| time.sleep(0.3) | ||
| sys.exit(0) | ||
| signal.signal(signal.SIGTERM, signal.SIG_IGN if sys.argv[1] == "True" else stop) | ||
| print(listener.getsockname()[1], flush=True) | ||
| while True: | ||
| time.sleep(1) | ||
| """ | ||
| command = [sys.executable, "-u", "-c", script, str(ignore_term)] | ||
| if non_child: | ||
| owner_script = """ | ||
| import subprocess, sys | ||
| master = subprocess.Popen(sys.argv[1:], stdout=subprocess.PIPE, text=True) | ||
| try: | ||
| port = master.stdout.readline().strip() | ||
| print(master.pid, port, flush=True) | ||
| sys.stdin.readline() | ||
| finally: | ||
| if master.poll() is None: | ||
| master.kill() | ||
| master.wait(timeout=5) | ||
| master.stdout.close() | ||
| """ | ||
| command = [sys.executable, "-u", "-c", owner_script, *command] | ||
| old = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, text=True) | ||
| try: | ||
| if non_child: | ||
| master_pid, port = map(int, old.stdout.readline().split()) | ||
| else: | ||
| master_pid, port = old.pid, int(old.stdout.readline()) | ||
| master = psutil.Process(master_pid) | ||
| monkeypatch.setattr( | ||
| mooncake_bootstrap.subprocess, | ||
| "run", | ||
| lambda *args, **kwargs: subprocess.CompletedProcess(args, 0, stdout=f"{master_pid}\n"), | ||
| ) | ||
|
|
||
| def launch_replacement(*args, **kwargs): | ||
| if non_child: | ||
| assert old.poll() is None, "The master owner must stay alive without reaping its child" | ||
| assert master.status() == psutil.STATUS_ZOMBIE | ||
| else: | ||
| assert old.poll() is not None, "Replacement launched before the old master exited" | ||
| with socket.socket() as listener: | ||
| listener.bind(("127.0.0.1", port)) | ||
| raise RuntimeError("Replacement boundary reached") | ||
|
|
||
| monkeypatch.setattr(mooncake_bootstrap.subprocess, "Popen", launch_replacement) | ||
| with pytest.raises(RuntimeError, match="Replacement boundary reached"): | ||
| config = OmegaConf.load(Path(__file__).resolve().parents[1] / "transfer_queue" / "config.yaml") | ||
| mooncake_bootstrap.initialize_mooncake_storage(config) | ||
| finally: | ||
| old.stdin.close() | ||
| if not non_child and old.poll() is None: | ||
| old.kill() | ||
| old.wait(timeout=5) | ||
| old.stdout.close() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we reuse line 77 here?