hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-05 18:11:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix dashboard agent check ppid is raylet pid (#12256)" (#12729)

Browse source 
This reverts commit 3ce9286977.
This commit is contained in:
Stephanie Wang 2020-12-09 17:20:38 -05:00 • committed by GitHub
parent d455cae036
commit a776209aec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dashboard/agent.py
View file

@ -91,12 +91,9 @@ class DashboardAgent(object):
async def _check_parent():
"""Check if raylet is dead."""
curr_proc = psutil.Process()
ppid = int(os.environ["RAY_NODE_PID"])
logger.info("Parent pid is %s", ppid)
while True:
parent = curr_proc.parent()
if parent is None or parent.pid == 1 or (ppid and
ppid != parent.pid):
if parent is None or parent.pid == 1:
logger.error("raylet is dead, agent will die because "
"it fate-shares with raylet.")
sys.exit(0)

5
dashboard/tests/test_dashboard.py
View file

@ -137,11 +137,6 @@ def test_basic(ray_start_with_dashboard):
assert agent_proc.pid == agent_pid
time.sleep(1)
# The agent should be dead if raylet exits.
raylet_proc.kill()
raylet_proc.wait()
agent_proc.wait(5)
# Check redis keys are set.
logger.info("Check redis keys are set.")
dashboard_address = client.get(dashboard_consts.REDIS_KEY_DASHBOARD)

2
src/ray/raylet/agent_manager.cc
View file

@ -58,10 +58,8 @@ void AgentManager::StartAgent() {
}
argv.push_back(NULL);
// Set node id to agent.
static std::string pid_string = std::to_string(getpid());
ProcessEnvironment env;
env.insert({"RAY_NODE_ID", options_.node_id.Hex()});
env.insert({"RAY_NODE_PID", pid_string});
Process child(argv.data(), nullptr, ec, false, env);
if (!child.IsValid() || ec) {
// The worker failed to start. This is a fatal error.