lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge-fix(controller/job.c): close mark_worker_jobs_exit split by conflict resolution

Browse source 
The two same-anchor insertions in job.c left one shared closing brace on
theirs' side (record_job_reconcile_assign_fact); our mark_worker_jobs_exit
(and the reconcile functions that followed it) were swallowed into an
unclosed function body -- "invalid storage class" / "expected declaration
at end of input" on xce_controller build. Added the missing '}' that closes
mark_worker_jobs_exit after its unlock(c->jobmgr).

Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
lei.chen 2026-09-03 14:16:36 +00:00
parent 6f757872c4
commit a013f4a460
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controller/job.c
View file

@ -3275,6 +3275,7 @@ void mark_worker_jobs_exit(cluster_t* c, const char* hostname)
} }
iter_destroy(&it); iter_destroy(&it);
unlock(c->jobmgr); unlock(c->jobmgr);
}
/* worker-rejoin-resync task 2.1 (Req 4.1-4.6, 5.4, 7.1-7.3): returns a job /* worker-rejoin-resync task 2.1 (Req 4.1-4.6, 5.4, 7.1-7.3): returns a job
* the worker reports as unrecognized back to PEND, releasing any resource * the worker reports as unrecognized back to PEND, releasing any resource