Skip to content

Commit

Permalink
close fd logger refactor
Browse files Browse the repository at this point in the history
Signed-off-by: ujjawal-khare <ujjawal.khare@dream11.com>
  • Loading branch information
ujjawal-khare committed Oct 15, 2024
1 parent 02a3d99 commit 2b4c3e0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 7 deletions.
9 changes: 2 additions & 7 deletions python/ray/dashboard/modules/job/job_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@
)
from ray.dashboard.modules.job.job_log_storage_client import JobLogStorageClient
from ray.dashboard.modules.job.job_supervisor import JobSupervisor
from ray.dashboard.modules.job.utils import (
close_logger_file_descriptor,
get_head_node_id,
)
from ray.dashboard.modules.job.utils import get_head_node_id
from ray.dashboard.utils import close_logger_file_descriptor
from ray.exceptions import ActorUnschedulableError, RuntimeEnvSetupError
from ray.job_submission import JobStatus
from ray.runtime_env import RuntimeEnvConfig
Expand Down Expand Up @@ -530,9 +528,6 @@ async def submit_job(
f"Started a ray job {submission_id}.", submission_id=submission_id
)

driver_logger = self._get_job_driver_logger(submission_id)
driver_logger.info("Runtime env is setting up.")
close_logger_file_descriptor(driver_logger)
supervisor = self._supervisor_actor_cls.options(
lifetime="detached",
name=JOB_ACTOR_NAME_TEMPLATE.format(job_id=submission_id),
Expand Down
32 changes: 32 additions & 0 deletions python/ray/dashboard/tests/abtest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from doc.source.serve.doc_code.streaming_tutorial import print


def close_logger_file_descriptor(logger_instance):
for handler in logger_instance.handlers:
handler.close()
logger_instance.removeHandler(handler)

import logging

LOGGER_FORMAT = "%(asctime)s\t%(levelname)s %(filename)s:%(lineno)s -- %(message)s"
def get_job_driver_logger(job_id: str) -> logging.Logger:
"""Return job driver logger to log messages to the job driver log file.
If this function is called for the first time, configure the logger.
"""
job_driver_logger = logging.getLogger(f"{__name__}.driver-{job_id}")

# Configure the logger if it's not already configured.
if not job_driver_logger.handlers:
job_driver_log_path = "/tmp/ray.log"
job_driver_handler = logging.FileHandler(job_driver_log_path)
job_driver_formatter = logging.Formatter(LOGGER_FORMAT)
job_driver_handler.setFormatter(job_driver_formatter)
job_driver_logger.addHandler(job_driver_handler)


def test_close_logger_file_descriptor():
logger = get_job_driver_logger("test_job_id")
print("Njx",logger.handlers)

test_close_logger_file_descriptor()

0 comments on commit 2b4c3e0

Please sign in to comment.