Claude
b3564737f7
yarn_client.py no longer invokes the 'yarn' binary via subprocess; it uses
httpx against /ws/v1/cluster/apps/* endpoints. This means the runtime image
no longer needs the Hadoop client installation — the only YARN-side
dependency left in the container is the config dir consumed by
spark-submit itself.
New model field:
- Job.yarn_rm_url: str | None
- PendingSubmission.yarn_rm_url: str | None (snapshotted at prepare)
prepare_submit_job snapshots Connection.yarn_rm_url into the pending
record (consistent with the existing master/deploy_mode/spark_conf
snapshot pattern); confirm_submit_job copies it onto the Job so
status/logs/kill can use it without re-looking-up the connection.
Resolution order for the RM URL at runtime:
1. Job.yarn_rm_url (preferred — survives connection edits/deletes)
2. Connection.yarn_rm_url fallback (if a future tool is added that
doesn't go through a Job)
3. YARN_RESOURCE_MANAGER_URL env var
Errors:
- YarnConfigError (HTTP 4xx semantics) when URL is missing/malformed
- YarnError for HTTP 4xx/5xx from the RM, network failures, missing
state field, or unparseable log responses
10 new tests in test_yarn_client.py cover the REST surface:
success, 404, 5xx, missing state field, env-var fallback, malformed
URL, log 404 with log-aggregation hint, kill PUT body shape, and
httpx connection-error wrapping.
25 lines
795 B
Python
25 lines
795 B
Python
# coding=utf-8
|
|
"""
|
|
@Time :2026/6/24
|
|
@Author :tao.chen
|
|
"""
|
|
from common.logging import logger
|
|
from spark_executor.core.job_store import JobStore
|
|
from spark_executor.core.yarn_client import get_application_logs
|
|
|
|
store = JobStore()
|
|
|
|
|
|
def get_job_logs(job_id: str, tail_chars: int = 5000) -> str:
|
|
logger.debug(f"get_job_logs enter job_id={job_id} tail_chars={tail_chars}")
|
|
job = store.get(job_id)
|
|
if job is None:
|
|
raise KeyError(f"Unknown job_id: {job_id}")
|
|
full = get_application_logs(job.application_id, job.yarn_rm_url)
|
|
tailed = full[-tail_chars:] if len(full) > tail_chars else full
|
|
logger.info(
|
|
f"get_job_logs ok job_id={job_id} application_id={job.application_id} "
|
|
f"full_chars={len(full)} returned_chars={len(tailed)}"
|
|
)
|
|
return tailed
|