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

merge: sync Rongsong's scheduler-framework into chatbot

Browse source 
Full merge of origin/scheduler-framework (scheduler-core restructure,
failover-adoption, WAL_JOB_DISPATCH, apiserver backend health/heartbeat,
build-time versioning, bug-1673/1676/1678/1679/1680).

Conflict resolution:
- scheduler: adopt Rongsong's scheduler-core architecture (driver loop,
  queue project/picker fields, resource bug-1569 fix)
- worker/controller_connector.c: keep Rongsong's reconnect/rejoin
  structure, PORT our bug-1509 resend_job_status onto the rejoin success
  path (his reconnect didn't re-report job state)
- apiserver backend: take Rongsong's health/heartbeat (supersedes our
  e505066 circuit breaker)
- group.c: keep our bug-1513 comment
- misc: take theirs for additive fixes (go_build versioning,
  test_group.c, persist.c RUSAGE_UPDATE, FilterRows bug-1680)

NOTE: our scheduler fixes (bug-1494 family dispatch-fail requeue,
PEND-reason classification) are NOT in Rongsong's branch — needs
verification/porting onto scheduler-core (separate follow-up).

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
lei.chen 2026-08-25 12:33:16 +00:00
commit 4e894d2184
395 changed files with 88517 additions and 5742 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/frontend/apiserver/controllers/jobs.go
View file

@ -550,7 +550,7 @@ func (j JobController) GetJobsInfo(ctx *gin.Context) {
found2 := false
found3 := false
// verify the fields is in supported list
supportedFields := utils.GetSupportedFields(models.JobSubmitRequest{})
supportedFields := utils.GetSupportedFields(models.JobInfo{})
utils.AddFieldsToSupportedList(&supportedFields, models.JobAdditionalFields{})
logger.Debug("job supportedFields: %v", zap.Any("supportedFields", supportedFields))
@ -898,7 +898,7 @@ func (j JobController) GetJobByIDs(ctx *gin.Context) {
found1 := false
found2 := false
// verify the fields is in supported list
supportedFields := utils.GetSupportedFields(models.JobSubmitRequest{})
supportedFields := utils.GetSupportedFields(models.JobInfo{})
utils.AddFieldsToSupportedList(&supportedFields, models.JobAdditionalFields{})
logger.Debug("job supportedFields: %v", zap.Any("supportedFields", supportedFields))
@ -1480,7 +1480,7 @@ func (j JobController) CreateJob(ctx *gin.Context) {
UserPriority: req.JobPriority,
DependCond: req.DependCond,
CWD: req.CWD,
FromHost: ctx.ClientIP(), //use ip now, need use hostname ?
FromHost: req.FromHost, // bug-1676: client-asserted hostname, passed through unchanged
PreExecCmd: req.PreExecCmd,
PostExecCmd: req.PostExecCmd,
RequeueErrorValues: req.RequeueErrorValues,