2fcacac2cb
Implements Phase 1 of .kiro/specs/external-license-resources/ (design.md): externally-reported license pools pushed by a dedicated daemon through the existing resval pipeline, with EXTERNAL-aware admission arithmetic. Wire & controller: - controller.capnp HostRole.extres (@5, appended); xce_join_req accepts it - extres.c: HostRole_extres join table (endpoint+name, no workermgr slot), leave cleanup; join.c/cluster.c dispatch - opupd.c do_update_resvals: extres branch runs the resource hooks and update_resval_list(c, NULL, ...) — host=="" entries route through update_val_res' SHARED branch into c->sharedinst; per-entry -EPERM for non-shared targets is logged, never fails the list - worker.c update_val_res: NULL worker only writes SHARED resources - cluster.c cluster_build_resources: rebuilt on resourceApplyDef (bug-1854) — EEXIST-tolerant so definitions added by an activation register on a RUNNING controller (bug-1973), and RES_APPLY_CHANGED updates definition fields (valtype/ordtype/flags/interval) in place so a corrected config heals a stale registration (bug-1974); seed_sharedinst_from_config skips EXTERNAL pools (daemon-reported free counts only; seeding would fabricate capacity while the daemon is down) Scheduler: - core_events.c RESVALS_DELTA: NULL/"" host marks a SHARED value and lands in core->sharedInst via dup_val (bug-1585 ownership rule), mirroring snapshot_load's host=="" precedent — previously WARN-skipped as unknown worker - resource.c unsatisfy_: EXTERNAL skips the inuse term (F >= uncomit + wanted; F is already net of our checkouts) xceesd (src/esd, new component): - script collectors polled per source, debounce on unchanged values, fail-open stale policy; pushes host=="" shared resvals over xcecli - reconnect gap fix (bug-1975): with a stable value the debounce pushed nothing and reconnects only fire inside a push — after a controller restart the daemon sat on a dead connection forever; the main loop now forces a full re-push when xcecli_is_connection_broken() (bug-1760 predicate) latches Config/mapping: - resources.yaml: extlic sample (location: [external]) - mapping.py: RESOURCE_FLAG_EXTERNAL (0x10) + location:["external"] mapping; xceadmin tests Tests (TDD, red->green per fix): test_extres_resvals.c (join+resval pipeline), test_config_resource_reconcile.c +2 (register past EEXIST / hot-apply changed definition), test_core_events.c +131 lines (shared DELTA landing), mapping tests. Suites: controller 1358/0, scheduler 100/0, esd 7/0, lib 1/0; check-no-fork covers src/esd. Live t1 E2E: config gen=15 push -> xceesd push extlic=4 lands in sharedinst -> rusage[extlic=3] job RUN; second job PENDs at free=1; release re-admits it; controller restart -> forced re-push restores the value and admission resumes. Full precommit job verification passed. Co-Authored-By: Claude Code <noreply@anthropic.com>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
* extres.c — connected extres daemons (HostRole_extres joins)
|
|
*
|
|
* external-license-resources Phase 1: the external-resources daemon
|
|
* (xceesd) joins the controller with HostRole_extres and pushes
|
|
* cluster-level (SHARED) resource values through the ordinary resval
|
|
* update pipeline (opupd.c do_update_resvals). Mirrors the apiserver
|
|
* join/leave registration in apiserver.c: endpoint + name only, no
|
|
* workermgr slot — the daemon is not a schedulable host. The controller
|
|
* never pushes TO the daemon; the daemon re-pushes its full value set on
|
|
* every (re)connect, so nothing here needs replay/WAL treatment.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "cluster.h"
|
|
#include "xstring.h"
|
|
#include "xce/cluster_def.h"
|
|
|
|
int add_extres(cluster_t* c, char* name, endpoint_t* ep)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < N_EXTRES_MAX; i++) {
|
|
if ((c->extresds[i].name != NULL)
|
|
&& (strcmp(c->extresds[i].name, name) == 0)) {
|
|
/* re-join (reconnect or failover re-join): rebind in place */
|
|
c->extresds[i].ep = ep;
|
|
return i;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < N_EXTRES_MAX; i++) {
|
|
if (c->extresds[i].name == NULL) {
|
|
c->extresds[i].name = makeString(name);
|
|
if (c->extresds[i].name == NULL) {
|
|
return -ENOMEM;
|
|
}
|
|
c->extresds[i].ep = ep;
|
|
return i;
|
|
}
|
|
}
|
|
|
|
ERROR("too many extres daemons (max %d); join from %s refused",
|
|
N_EXTRES_MAX, name);
|
|
return -ENOSPC;
|
|
}
|
|
|
|
int handle_extres_leave(cluster_t* c, endpoint_t* ep)
|
|
{
|
|
ep_private_t* priv;
|
|
int i;
|
|
|
|
if (ep == NULL) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
priv = (ep_private_t*)ep->data;
|
|
if (priv == NULL) {
|
|
return -EINVAL;
|
|
}
|
|
|
|
i = priv->u.idx;
|
|
if ((i < 0) || (i >= N_EXTRES_MAX)) {
|
|
SET_ERROR(EINVAL);
|
|
return -errno;
|
|
}
|
|
|
|
/* Only clear if it is still our binding — a re-join may have rebound
|
|
* the slot to a new endpoint before this old one's close event ran. */
|
|
if (c->extresds[i].ep == ep) {
|
|
c->extresds[i].ep = NULL;
|
|
}
|
|
|
|
return 0;
|
|
}
|