wdgzyjx/myxce
1
0
Fork 0
forked from lei.chen/myxce
Code Pull requests Activity

fix(frontend): job control no longer returns HTTP 500 (bug-1490)

Browse source 
Two stacked defects in the apiserver job-control link, both of which kept
hold/release/cancel from ever reaching the controller:

1. controllers/jobs.go: validateJobControl and foundJob asserted
   jobinfo.Data["array_idx"].(int64), but StoreToOrderMaps produces
   array_idx as int (models.JobInfo.ArrayIdx is declared int) -> panic
   -> Gin Recovery -> HTTP 500 before backend.ControlJob ran. Add
   normalizeJobInt64 / jobArrayIdx helpers and use them in both
   functions (job_status already had this fix via normalizeJobStatus;
   array_idx was missed).

2. backend/clib.go: backend.ControlJob set xce_jobctrl_t.action to the
   models.JOB_* constant (JOB_STOP=1 / JOB_RESUME=2 / JOB_KILL=3 /
   JOB_CHKPNT=8), but that field is the capnp JobControl union
   discriminant (JobControl_u_siginfo=0 / JobControl_u_ckptoption=1).
   The controller's job_ctrl() selected the wrong union branch (or
   none, since encode_JobControl drops the union pointer for
   non-0/1 discriminants) and rejected every control with -EINVAL.
   Add jobCtrlDiscriminant() and use it.

Also: resolveExecUser was defined in the cgo-only convert.go but is
exercised by a non-cgo test, so `make test` (CGO_ENABLED=0) failed to
build the backend package. Move it to convert_pure.go so it compiles in
both modes.

Tests: 3 controller regression tests (validateJobControl allowed /
not-allowed branches, foundJob array-child branch) + 1 backend
jobCtrlDiscriminant test. make test fully green. Cluster E2E verified:
hold -> PSUSP, release -> PEND, cancel -> EXIT on a PEND job, no 500,
no -EINVAL, all daemons healthy.

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
lei.chen 2026-08-07 07:35:51 +00:00
parent d3a92f1033
commit c90e63ec0f
7 changed files with 368 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/frontend/apiserver/backend/convert_test.go
View file

@ -5,6 +5,33 @@ import (
"testing"
)
// TestJobCtrlDiscriminant is a regression test for bug-1490: backend.ControlJob
// used to set xce_jobctrl_t.action to the models.JOB_* constant
// (JOB_STOP=1/JOB_RESUME=2/JOB_KILL=3/JOB_CHKPNT=8), but that field is the
// capnp JobControl union DISCRIMINANT (JobControl_u_siginfo=0,
// JobControl_u_ckptoption=1). The controller's job_ctrl() interpreted the wrong
// union branch (or none) and rejected every control request with -EINVAL, so
// hold/release/cancel never reached the job.
func TestJobCtrlDiscriminant(t *testing.T) {
cases := []struct {
name string
action int
want int
}{
{"stop is a signal action", models.JOB_STOP, 0}, // JobControl_u_siginfo
{"resume is a signal action", models.JOB_RESUME, 0},
{"kill is a signal action", models.JOB_KILL, 0},
{"checkpoint is a ckptoption action", models.JOB_CHKPNT, 1}, // JobControl_u_ckptoption
}
for _, tc := range cases {
t.Run(tc.name, func(t *testing.T) {
if got := jobCtrlDiscriminant(tc.action); got != tc.want {
t.Errorf("jobCtrlDiscriminant(%d) = %d, want %d", tc.action, got, tc.want)
}
})
}
}
func TestRawJobToModel_BasicFields(t *testing.T) {
r := rawJobData{
jobID: 123,