feat(scheduler-core): define new event payload types (task 7.2)
Adds JobStateChangeEvent (jobid/oldState/newState/exitCode) and JobUpdateEvent (jobid/changedFields/job: Job) to controller.capnp, matching design.md's spec verbatim. JobUpdateEvent.job reuses the existing full 12-field Job/xce_job_t record, verified distinct from the narrower SchedJob struct sharing the same mapname. Extends ReplayEvent.body's union (task 7.1) with jobStateChange@10/ jobUpdate@11 -- the only two valid next ordinals, since capnp requires strictly sequential ordinals with no gaps across a struct and task 7.1 deliberately stopped at @9. Existing @0-@9 fields and every other struct in the schema are byte-identical. Deep round-trip tests in test_e2e_capnp.c exercise every field with non-default values, including the 3-level nested Job substructs (submitData/allocs/pidinfo/pendreason). JOB_F_* bitmask bit values deliberately left undefined -- a later task's job, not this schema-only one's. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019dw5WnN3DXStaEaPYfACU1
This commit is contained in:
parent
68a6196517
commit
755230705c
SSH key fingerprint:
SHA256:8Vf2pZ3h6rJa7EhGK+WaAQ9Mta/apZvteW6g9U/WKKk
4 changed files with 295 additions and 4 deletions
|
|
@ -545,6 +545,248 @@ static void test_session_summary_round_trip(void)
|
|||
printf("test_session_summary_round_trip: PASS\n");
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Test 9: JobStateChangeEvent round-trip (scheduler-core task 7.2, */
|
||||
/* Req 5 AC 20) -- the first of the two genuinely new ReplayEvent.body */
|
||||
/* payload types. Uses the encode_X/decode_X codec bridge (Test 6's */
|
||||
/* pattern) since job_state_change_event_t is a real, fully-scalar C */
|
||||
/* struct with no Data fields -- unlike the frame-only replay-envelope */
|
||||
/* types in Tests 7-8, which have no live C struct yet. */
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static void test_job_state_change_event_round_trip(void)
|
||||
{
|
||||
job_state_change_event_t src;
|
||||
memset(&src, 0, sizeof(src));
|
||||
src.jobid = 42424ULL;
|
||||
src.old_state = 2u;
|
||||
src.new_state = 8u;
|
||||
src.exit_code = -7;
|
||||
|
||||
struct capn c;
|
||||
capn_init_malloc(&c);
|
||||
struct capn_segment *cs = capn_root(&c).seg;
|
||||
|
||||
JobStateChangeEvent_ptr p;
|
||||
encode_JobStateChangeEvent_ptr(cs, &p, &src);
|
||||
capn_setp(capn_root(&c), 0, p.p);
|
||||
|
||||
int64_t sz = capn_size(&c);
|
||||
TEST_ASSERT_TRUE(sz > 0);
|
||||
uint8_t *buf = (uint8_t *)malloc((size_t)sz);
|
||||
TEST_ASSERT_NOT_NULL(buf);
|
||||
capn_write_mem(&c, buf, (size_t)sz, 0);
|
||||
capn_free(&c);
|
||||
|
||||
struct capn d;
|
||||
TEST_ASSERT_EQUAL_INT(0, capn_init_mem(&d, buf, (size_t)sz, 0));
|
||||
JobStateChangeEvent_ptr dp;
|
||||
dp.p = capn_getp(capn_root(&d), 0, 1);
|
||||
struct JobStateChangeEvent wire;
|
||||
read_JobStateChangeEvent(&wire, dp);
|
||||
job_state_change_event_t dst;
|
||||
memset(&dst, 0, sizeof(dst));
|
||||
decode_JobStateChangeEvent(&dst, &wire);
|
||||
|
||||
TEST_ASSERT_EQUAL_UINT64(42424ULL, dst.jobid);
|
||||
TEST_ASSERT_EQUAL_UINT32(2u, dst.old_state);
|
||||
TEST_ASSERT_EQUAL_UINT32(8u, dst.new_state);
|
||||
TEST_ASSERT_EQUAL_INT32(-7, dst.exit_code);
|
||||
|
||||
capn_free(&d);
|
||||
free(buf);
|
||||
printf("test_job_state_change_event_round_trip: PASS\n");
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Test 10: JobUpdateEvent round-trip (scheduler-core task 7.2, */
|
||||
/* Req 5 AC 20) -- the second genuinely new ReplayEvent.body payload */
|
||||
/* type. `job` embeds the FULL updated record by reusing the */
|
||||
/* pre-existing Job/xce_job_t struct; populated non-trivially, including*/
|
||||
/* nested submit/allocs/pidinfo/pend_reasons (incl. the HostAlloc/ */
|
||||
/* ResAlloc list-of-pointers two levels down), to prove the whole tree */
|
||||
/* round-trips through encode_Job_ptr/decode_Job_ptr -- the same nested-*/
|
||||
/* pointer codec chain already proven for xce_job_submit_t->submit in */
|
||||
/* Test 6, now exercised for Job's full field set. */
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
||||
static void test_job_update_event_round_trip(void)
|
||||
{
|
||||
/* Innermost: one HostAlloc with one ResAlloc. */
|
||||
xce_alloc_t res_alloc;
|
||||
memset(&res_alloc, 0, sizeof(res_alloc));
|
||||
res_alloc.resname = "cpu";
|
||||
res_alloc.reserve = "resv1";
|
||||
res_alloc.instid = 42ULL;
|
||||
res_alloc.value = 4.0;
|
||||
res_alloc.from = 500ULL;
|
||||
res_alloc.duration = 3600LL;
|
||||
xce_alloc_t *res_allocs[1] = { &res_alloc };
|
||||
|
||||
xce_host_alloc_t host_alloc;
|
||||
memset(&host_alloc, 0, sizeof(host_alloc));
|
||||
host_alloc.host = "hostA";
|
||||
host_alloc.nallocs = 1;
|
||||
host_alloc.allocs = res_allocs;
|
||||
xce_host_alloc_t *host_allocs[1] = { &host_alloc };
|
||||
|
||||
xce_job_alloc_t job_alloc;
|
||||
memset(&job_alloc, 0, sizeof(job_alloc));
|
||||
job_alloc.jobid = 8001ULL;
|
||||
job_alloc.nhosts = 1;
|
||||
job_alloc.allocs = host_allocs;
|
||||
job_alloc.nres_shared = 0;
|
||||
job_alloc.allocs_shared = NULL;
|
||||
|
||||
job_submit_data_t submit;
|
||||
memset(&submit, 0, sizeof(submit));
|
||||
submit.queue = "normal";
|
||||
submit.user = "alice";
|
||||
submit.mintasks = 2u;
|
||||
submit.maxtasks = 8u;
|
||||
submit.start_info = NULL;
|
||||
submit.job_name = "update-test-job";
|
||||
submit.project_name = "proj-x";
|
||||
submit.user_group = "grp-x";
|
||||
submit.job_description = "job update event round-trip test";
|
||||
submit.resreq = "select=2";
|
||||
|
||||
unsigned int pids[2] = { 111u, 222u };
|
||||
unsigned int pgids[1] = { 333u };
|
||||
job_pidinfo_t pidinfo;
|
||||
memset(&pidinfo, 0, sizeof(pidinfo));
|
||||
pidinfo.jobid = 8001ULL;
|
||||
pidinfo.npids = 2;
|
||||
pidinfo.pids = pids;
|
||||
pidinfo.npgids = 1;
|
||||
pidinfo.pgids = pgids;
|
||||
pidinfo.exdata = "pid-exdata";
|
||||
|
||||
xce_job_preason_t pend_reasons;
|
||||
memset(&pend_reasons, 0, sizeof(pend_reasons));
|
||||
pend_reasons.main_reason = 7;
|
||||
pend_reasons.nhost_reasons = 0;
|
||||
pend_reasons.host_based_reasons = NULL;
|
||||
pend_reasons.nres_reasons = 0;
|
||||
pend_reasons.res_based_reasons = NULL;
|
||||
|
||||
xce_job_t job;
|
||||
memset(&job, 0, sizeof(job));
|
||||
job.jobid = 8001ULL;
|
||||
job.submit = &submit;
|
||||
job.sub_time = 1000;
|
||||
job.queue_time = 2000;
|
||||
job.start_time = 3000;
|
||||
job.finish_time = 4000;
|
||||
job.state = 5u;
|
||||
job.allocs = &job_alloc;
|
||||
job.run_time = 120;
|
||||
job.pidinfo = &pidinfo;
|
||||
job.pend_reasons = &pend_reasons;
|
||||
job.transient_since = 9999ULL;
|
||||
|
||||
job_update_event_t src;
|
||||
memset(&src, 0, sizeof(src));
|
||||
src.jobid = 8001ULL;
|
||||
src.changed_fields = 0x5u;
|
||||
src.job = &job;
|
||||
|
||||
struct capn c;
|
||||
capn_init_malloc(&c);
|
||||
struct capn_segment *cs = capn_root(&c).seg;
|
||||
|
||||
JobUpdateEvent_ptr p;
|
||||
encode_JobUpdateEvent_ptr(cs, &p, &src);
|
||||
capn_setp(capn_root(&c), 0, p.p);
|
||||
|
||||
int64_t sz = capn_size(&c);
|
||||
TEST_ASSERT_TRUE(sz > 0);
|
||||
uint8_t *buf = (uint8_t *)malloc((size_t)sz);
|
||||
TEST_ASSERT_NOT_NULL(buf);
|
||||
capn_write_mem(&c, buf, (size_t)sz, 0);
|
||||
capn_free(&c);
|
||||
|
||||
struct capn d;
|
||||
TEST_ASSERT_EQUAL_INT(0, capn_init_mem(&d, buf, (size_t)sz, 0));
|
||||
JobUpdateEvent_ptr dp;
|
||||
dp.p = capn_getp(capn_root(&d), 0, 1);
|
||||
struct JobUpdateEvent wire;
|
||||
read_JobUpdateEvent(&wire, dp);
|
||||
job_update_event_t dst;
|
||||
memset(&dst, 0, sizeof(dst));
|
||||
decode_JobUpdateEvent(&dst, &wire);
|
||||
|
||||
TEST_ASSERT_EQUAL_UINT64(8001ULL, dst.jobid);
|
||||
TEST_ASSERT_EQUAL_UINT32(0x5u, dst.changed_fields);
|
||||
TEST_ASSERT_NOT_NULL(dst.job);
|
||||
|
||||
TEST_ASSERT_EQUAL_UINT64(8001ULL, dst.job->jobid);
|
||||
TEST_ASSERT_EQUAL_UINT64(1000ULL, (uint64_t)dst.job->sub_time);
|
||||
TEST_ASSERT_EQUAL_UINT64(2000ULL, (uint64_t)dst.job->queue_time);
|
||||
TEST_ASSERT_EQUAL_UINT64(3000ULL, (uint64_t)dst.job->start_time);
|
||||
TEST_ASSERT_EQUAL_UINT64(4000ULL, (uint64_t)dst.job->finish_time);
|
||||
TEST_ASSERT_EQUAL_UINT32(5u, dst.job->state);
|
||||
TEST_ASSERT_EQUAL_INT(120, dst.job->run_time);
|
||||
TEST_ASSERT_EQUAL_UINT64(9999ULL, dst.job->transient_since);
|
||||
|
||||
TEST_ASSERT_NOT_NULL(dst.job->submit);
|
||||
TEST_ASSERT_EQUAL_STRING("normal", dst.job->submit->queue);
|
||||
TEST_ASSERT_EQUAL_STRING("alice", dst.job->submit->user);
|
||||
TEST_ASSERT_EQUAL_UINT32(2u, dst.job->submit->mintasks);
|
||||
TEST_ASSERT_EQUAL_UINT32(8u, dst.job->submit->maxtasks);
|
||||
TEST_ASSERT_EQUAL_STRING("update-test-job", dst.job->submit->job_name);
|
||||
TEST_ASSERT_EQUAL_STRING("proj-x", dst.job->submit->project_name);
|
||||
TEST_ASSERT_EQUAL_STRING("grp-x", dst.job->submit->user_group);
|
||||
TEST_ASSERT_EQUAL_STRING("job update event round-trip test",
|
||||
dst.job->submit->job_description);
|
||||
TEST_ASSERT_EQUAL_STRING("select=2", dst.job->submit->resreq);
|
||||
|
||||
TEST_ASSERT_NOT_NULL(dst.job->allocs);
|
||||
TEST_ASSERT_EQUAL_UINT64(8001ULL, dst.job->allocs->jobid);
|
||||
TEST_ASSERT_EQUAL_INT(1, dst.job->allocs->nhosts);
|
||||
TEST_ASSERT_NOT_NULL(dst.job->allocs->allocs);
|
||||
TEST_ASSERT_EQUAL_STRING("hostA", dst.job->allocs->allocs[0]->host);
|
||||
TEST_ASSERT_EQUAL_INT(1, dst.job->allocs->allocs[0]->nallocs);
|
||||
TEST_ASSERT_NOT_NULL(dst.job->allocs->allocs[0]->allocs);
|
||||
TEST_ASSERT_EQUAL_STRING("cpu",
|
||||
dst.job->allocs->allocs[0]->allocs[0]->resname);
|
||||
TEST_ASSERT_EQUAL_STRING("resv1",
|
||||
dst.job->allocs->allocs[0]->allocs[0]->reserve);
|
||||
TEST_ASSERT_EQUAL_UINT64(42ULL,
|
||||
dst.job->allocs->allocs[0]->allocs[0]->instid);
|
||||
/* Unity is built without UNITY_INCLUDE_DOUBLE; compare via float cast
|
||||
* (same pattern as scheduler/testsuite/test.c). */
|
||||
TEST_ASSERT_EQUAL_FLOAT(4.0f,
|
||||
(float)dst.job->allocs->allocs[0]->allocs[0]->value);
|
||||
TEST_ASSERT_EQUAL_UINT64(500ULL,
|
||||
dst.job->allocs->allocs[0]->allocs[0]->from);
|
||||
TEST_ASSERT_EQUAL_INT64(3600LL,
|
||||
dst.job->allocs->allocs[0]->allocs[0]->duration);
|
||||
TEST_ASSERT_EQUAL_INT(0, dst.job->allocs->nres_shared);
|
||||
TEST_ASSERT_NULL(dst.job->allocs->allocs_shared);
|
||||
|
||||
TEST_ASSERT_NOT_NULL(dst.job->pidinfo);
|
||||
TEST_ASSERT_EQUAL_UINT64(8001ULL, dst.job->pidinfo->jobid);
|
||||
TEST_ASSERT_EQUAL_INT(2, dst.job->pidinfo->npids);
|
||||
TEST_ASSERT_EQUAL_UINT32(111u, dst.job->pidinfo->pids[0]);
|
||||
TEST_ASSERT_EQUAL_UINT32(222u, dst.job->pidinfo->pids[1]);
|
||||
TEST_ASSERT_EQUAL_INT(1, dst.job->pidinfo->npgids);
|
||||
TEST_ASSERT_EQUAL_UINT32(333u, dst.job->pidinfo->pgids[0]);
|
||||
TEST_ASSERT_EQUAL_STRING("pid-exdata", dst.job->pidinfo->exdata);
|
||||
|
||||
TEST_ASSERT_NOT_NULL(dst.job->pend_reasons);
|
||||
TEST_ASSERT_EQUAL_INT(7, dst.job->pend_reasons->main_reason);
|
||||
TEST_ASSERT_EQUAL_INT(0, dst.job->pend_reasons->nhost_reasons);
|
||||
TEST_ASSERT_NULL(dst.job->pend_reasons->host_based_reasons);
|
||||
TEST_ASSERT_EQUAL_INT(0, dst.job->pend_reasons->nres_reasons);
|
||||
TEST_ASSERT_NULL(dst.job->pend_reasons->res_based_reasons);
|
||||
|
||||
free_JobUpdateEvent(&dst);
|
||||
capn_free(&d);
|
||||
free(buf);
|
||||
printf("test_job_update_event_round_trip: PASS\n");
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Suite entry point */
|
||||
/* ------------------------------------------------------------------ */
|
||||
|
|
@ -562,4 +804,6 @@ void test_e2e_capnp(void)
|
|||
RUN_TEST(test_data_job_array_variant_round_trip);
|
||||
RUN_TEST(test_replay_header_snapshot_entry_round_trip);
|
||||
RUN_TEST(test_session_summary_round_trip);
|
||||
RUN_TEST(test_job_state_change_event_round_trip);
|
||||
RUN_TEST(test_job_update_event_round_trip);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue