fix(submit): create Job record for failed submits with recovered application_id
Audit of the previous 'salvage application_id from stderr' change
(e4fb97c) revealed the fix was incomplete:
- The pending record now had pending.application_id set on failure.
- But get_job_logs / get_job_status / kill_job all look up the
application_id through JobStore.get_either(application_id), which
scans the on-disk jobs.json for a Job record matching that
application_id. No Job record was being created on the failure
path, so the recovered application_id was unreachable through
the public tool surface — get_job_logs would 404 with 'No Job
found for id=...application_xxx'.
Fix: when confirm_submit_job's failure branch successfully extracts
an application_id from stderr, it now also creates a Job record (same
shape as the success path: 12-char hex job_id, application_id,
script_path, queue, submit_time, connection, yarn_rm_url). The Job's
only job in this case is to act as the lookup index from the
LLM-facing tools into the underlying YARN app.
The job_id is generated even when application_id recovery fails (so
we always set pending.job_id), but the Job record is only put when
application_id is non-None. That keeps the 'spark-submit died locally
before reaching YARN' case clean: no Job record, get_job_logs gets
the standard 'no logs available' error from yarn_client, not a
404 from JobStore.
Tests:
- test_confirm_recovers_application_id_from_failed_spark_submit now
asserts both that pending.application_id is set AND that a Job
record exists and is findable by both job_id AND application_id.
- test_confirm_failed_spark_submit_without_application_id_keeps_it_none
asserts the negative case: no application_id, no Job record.
Fixture fix: _fresh() now rebinds submit.job_store to use tmp_path.
Previously the test wrote to ./data/jobs.json (the real data dir),
which left stale records between test runs and broke any test that
scanned by application_id. This is a latent bug exposed by the new
assertions; fixing it here also makes every other confirm test
hermetic.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -212,10 +212,12 @@ def confirm_submit_job(*, pending_id: str) -> SubmitResult:
|
||||
# auth expired, the YARN app was launched but spark-submit lost
|
||||
# its connection, the PySpark script exited non-zero after
|
||||
# YARN had already accepted it, ...). In several of those cases
|
||||
# the stderr still contains "Submitted application <id>" — try
|
||||
# to salvage it so the user can fetch logs via
|
||||
# get_application_logs on the failed job. Failure to recover
|
||||
# application_id is non-fatal; we still mark FAILED and raise.
|
||||
# the stderr still contains "Submitted application <id>".
|
||||
# We must salvage it AND create a Job record keyed by a fresh
|
||||
# job_id, so the user can fetch logs / status / kill the
|
||||
# underlying YARN app via the normal get_job_* tools (which
|
||||
# all look up through JobStore). Without a Job record the
|
||||
# application_id is just a string with no log target.
|
||||
if getattr(exc, "result", None) is not None:
|
||||
try:
|
||||
application_id, tracking_url = parse_spark_submit_output(
|
||||
@@ -226,15 +228,39 @@ def confirm_submit_job(*, pending_id: str) -> SubmitResult:
|
||||
else:
|
||||
application_id, tracking_url = None, None
|
||||
|
||||
job_id = uuid.uuid4().hex[:12]
|
||||
pending.status = "FAILED"
|
||||
pending.error = str(exc)
|
||||
pending.job_id = job_id
|
||||
if application_id:
|
||||
pending.application_id = application_id
|
||||
pending.tracking_url = tracking_url
|
||||
pending_store.save(pending)
|
||||
|
||||
if application_id:
|
||||
# Create a Job record so get_job_logs / get_job_status /
|
||||
# kill_job can find the application_id. The Job's
|
||||
# application_id is the only field that matters for those
|
||||
# lookups; everything else is best-effort metadata.
|
||||
job_store.put(
|
||||
Job(
|
||||
job_id=job_id,
|
||||
application_id=application_id,
|
||||
script_path=pending.script_path,
|
||||
queue=pending.queue,
|
||||
submit_time=datetime.utcnow(),
|
||||
connection=pending.connection,
|
||||
yarn_rm_url=pending.yarn_rm_url,
|
||||
)
|
||||
)
|
||||
logger.info(
|
||||
f"confirm_submit_job recorded Job for failed submit: "
|
||||
f"job_id={job_id} application_id={application_id}"
|
||||
)
|
||||
|
||||
logger.error(
|
||||
f"confirm_submit_job failed pending_id={pending_id} "
|
||||
f"application_id={application_id} err={exc}"
|
||||
f"job_id={job_id} application_id={application_id} err={exc}"
|
||||
)
|
||||
raise
|
||||
|
||||
|
||||
Reference in New Issue
Block a user