Skip to content

Replace partition by rpartition for parsing app_id #523

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

Closed
wants to merge 1 commit into from
Closed

Replace partition by rpartition for parsing app_id #523

Show file tree
Hide file tree
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
21 changes: 17 additions & 4 deletions torchx/schedulers/ray_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
import json
import logging
import os
import re
import tempfile
import time
from dataclasses import dataclass, field
from datetime import datetime
from shutil import copy2, rmtree
from typing import Any, cast, Dict, Iterable, List, Mapping, Optional, Set, Type # noqa
from typing import Any, cast, Dict, Iterable, List, Optional, Tuple # noqa

from torchx.schedulers.api import (
AppDryRunInfo,
Expand Down Expand Up @@ -322,13 +323,25 @@ def wait_until_finish(self, app_id: str, timeout: int = 30) -> None:
break
time.sleep(1)

def _cancel_existing(self, app_id: str) -> None: # pragma: no cover
def _parse_app_id(self, app_id: str) -> Tuple[str, str]:
# find index of '-' in the first :\d+-
m = re.search(r":\d+-", app_id)
if m:
sep = m.span()[1]
addr = app_id[: sep - 1]
app_id = app_id[sep:]
return addr, app_id

addr, _, app_id = app_id.partition("-")
return addr, app_id

def _cancel_existing(self, app_id: str) -> None: # pragma: no cover
addr, app_id = self._parse_app_id(app_id)
client = JobSubmissionClient(f"http://{addr}")
client.stop_job(app_id)

def _get_job_status(self, app_id: str) -> JobStatus:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to have explicit concepts that expresses app_id and maybe_app_id_address.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, long term I'm not very happy with how we're adding the addr in here -- I think we might need to do some config refactors on this so there's a way to set a "scheduler" config for non submit methods. Most other schedulers pull context info like this from the environment variables but ray doesn't seem to do that

addr, _, app_id = app_id.partition("-")
addr, app_id = self._parse_app_id(app_id)
client = JobSubmissionClient(f"http://{addr}")
status = client.get_job_status(app_id)
if isinstance(status, str):
Expand Down Expand Up @@ -375,7 +388,7 @@ def log_iter(
streams: Optional[Stream] = None,
) -> Iterable[str]:
# TODO: support tailing, streams etc..
addr, _, app_id = app_id.partition("-")
addr, app_id = self._parse_app_id(app_id)
client: JobSubmissionClient = JobSubmissionClient(f"http://{addr}")
logs: str = client.get_job_logs(app_id)
iterator = split_lines(logs)
Expand Down
17 changes: 17 additions & 0 deletions torchx/schedulers/test/ray_scheduler_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,23 @@ def test_requirements(self) -> None:
job = req.request
self.assertEqual(job.requirements, reqs)

def test_parse_app_id(self) -> None:
test_addr_appid = [
(
"0.0.0.0:1234-app_id",
"0.0.0.0:1234",
"app_id",
), # (full address, address:port, app_id)
("addr-of-cluster:1234-app-id", "addr-of-cluster:1234", "app-id"),
("www.test.com:1234-app:id", "www.test.com:1234", "app:id"),
("foo", "foo", ""),
("foo-bar-bar", "foo", "bar-bar"),
]
for test_example, addr, app_id in test_addr_appid:
parsed_addr, parsed_appid = self._scheduler._parse_app_id(test_example)
self.assertEqual(parsed_addr, addr)
self.assertEqual(parsed_appid, app_id)

class RayClusterSetup:
_instance = None # pyre-ignore[4]

Expand Down