ClaudeandClaude Fable 5
0fef77c0b8
Two user-reported bugs, same root cause: the in-memory JobStore + the
'job_id must be the 12-char hex' tool contract.
Bug 1: 'Unknown job_id' reported frequently
JobStore was a process-local dict (spark_executor/core/job_store.py).
Under gunicorn workers > 1, a job created by confirm_submit_job
landing on worker A was invisible to worker B, so a follow-up
get_job_status / get_job_result / get_job_logs / kill_job landing on
a different worker returned 'Unknown job_id'. Same multi-worker
problem that bit the MCP session layer; only the affected data was
different.
Bug 2: 'get_job_logs frequently confuses job_id and application_id'
confirm_submit_job returns BOTH identifiers in SubmitResult, but
get_job_logs (and friends) only accepted the local 12-char job_id
and never said so in their description. When the agent passed the
YARN application_id, the error message itself was misleading:
'Unknown job_id: application_17400000001_0001' — the agent had
passed an id, just the wrong kind.
This change fixes both at the root:
* JobStore is now JSON-backed at data/jobs.json (atomic tempfile +
os.replace), with cross-process safety via fcntl.flock on a sibling
.lock file. Stage 3's SQLite migration is still planned; the file
format is intentionally simple so it is a straight
'for j in read_all(): db.insert(j)'.
* New JobStore.get_either(uid) looks up by job_id first, then
application_id. All four job-lifecycle tools (get_job_status,
get_job_result, get_job_logs, kill_job) call get_either instead
of get(job_id), so the agent can pass either identifier and get
the same answer.
* The 'neither matched' KeyError now spells out both id forms and
what they look like, so the agent isn't left guessing.
* server.py tool descriptions for the four job tools explicitly
state 'job_id accepts BOTH identifiers' so this is visible to the
LLM at tool-selection time, not only at error time.
Tests:
* test_job_store.py: tmp_path isolation, persistence across
instances, human-readable JSON, corrupt-file resilience,
get_either (by job_id, by application_id, collision preference,
unknown), put idempotency.
* test_{logs,status,kill,result}_tool.py: per-test tmp_path fixture,
'accepts application_id' regression for each tool, and an
explicit assertion that the unknown-id error message mentions
BOTH id forms. test_result_raises_keyerror_for_unknown_job's
match pattern updated for the new message.
242 tests pass (was 226; +16 new). Zero regressions.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
34 lines
1.2 KiB
Python
34 lines
1.2 KiB
Python
# coding=utf-8
|
|
"""
|
|
@Time :2026/6/24
|
|
@Author :tao.chen
|
|
"""
|
|
from common.logging import logger
|
|
from spark_executor.core.yarn_client import YarnClientConfig
|
|
from spark_executor.core.job_store import JobStore
|
|
from spark_executor.core.yarn_client import get_application_status
|
|
from spark_executor.models import JobStatus
|
|
from spark_executor.tools.connections import store as conn_store
|
|
from spark_executor.tools.logs import _unknown_job_error
|
|
|
|
store = JobStore()
|
|
|
|
|
|
def get_job_status(job_id: str) -> JobStatus:
|
|
"""Query YARN for a job's current status.
|
|
|
|
`job_id` accepts either the local job_id (returned by
|
|
confirm_submit_job) or the YARN application_id.
|
|
"""
|
|
logger.debug(f"get_job_status enter job_id={job_id}")
|
|
job = store.get_either(job_id)
|
|
if job is None:
|
|
raise _unknown_job_error(job_id)
|
|
conn = conn_store.get(job.connection)
|
|
if conn is None:
|
|
raise KeyError(f"Connection not found: {job.connection}")
|
|
config = YarnClientConfig.from_connection(conn)
|
|
state, raw = get_application_status(job.application_id, config)
|
|
logger.info(f"get_job_status ok job_id={job.job_id} application_id={job.application_id} state={state}")
|
|
return JobStatus(application_id=job.application_id, state=state, raw=raw)
|