merge-fix: port our scheduler/worker/apiserver fixes onto scheduler-framework merge
After merging origin/scheduler-framework (scheduler-core), re-apply and reconcile our fixes that Rongsong's branch lacked or implemented differently: - handler.c: keep the code<0 dispatch-fail check (bug-1512: a code-0 success ack must NOT re-PEND, or dispatched jobs spawn duplicates). Use sched_job_state_change (Rongsong's enqueue mechanism) instead of sched_requeue_pend_job so the merged test framework (pop_jstate_change) stays valid. Drop Rongsong's duplicate unconditional re-PEND case. - scheduler.c: port sched_requeue_pend_job (bug-1494 class) adapted to sched_get_job(&sched->core, ...) signature. - types.h: re-add xce_sched_queue_t.dispatchwindow (our time-window PEND reason field) dropped when taking Rongsong's types.h. - models/jobs.go: re-add JobSubmitResponse.JobIDHuman (human job id). - worker controller_connector.c: our bug-1509 resend_job_status on rejoin success was already ported; add test stub. - tests: adapt dispatch-fail test (code=0 → no re-PEND); fix sched_get_job signature in white-box stubs. Build passes (nix build .#xce). Unit + live-cluster verification pending. Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
4e894d2184
commit
7ea117dafa
9 changed files with 65 additions and 29 deletions
|
|
@ -134,6 +134,14 @@ bool ipc_master_send_job_ckpt(uint64_t job_id, int kill, const char* method)
|
|||
|
||||
void xcecd_process_command(void* arg) { (void)arg; }
|
||||
|
||||
/* bug-1509 resend on rejoin (checking_connection's rejoin success path) —
|
||||
* this test exercises rejoin, not the resend; a stub that reports success. */
|
||||
bool resend_job_status(xcecd_worker_t* worker_list)
|
||||
{
|
||||
(void)worker_list;
|
||||
return true;
|
||||
}
|
||||
|
||||
/* ════════════════════════════════════════════════════════════════════════
|
||||
* Fixtures
|
||||
* ════════════════════════════════════════════════════════════════════════ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue