Every caller composes through mesh-sdk's go/compose since issues 1386 to 1388; the controller's second copy of the composition is dead code. The parent of this commit isfb556d6b, whose try (build-1792493691274712799, 17m28s, 2026-10-20 11:12 UTC) ran the equality test green on the live facts: every machine was sent and compared both ways (ADR 0453, issue 1384). Deleted, 40 functions: in plan.go planFor, declarationWith, renderingFor, grantsFor, theRestOfTheMesh and their helpers (boundOfGrant, busCredentialIssued, carriedBuilds, carriedOn, composeBusUsers, engineJudgesRoot, engineReadsHealth, engineTakesHanded, takesHanded, givenUnderAnOldKey, issuedToHolder, keyFor, licencesFor, managerPublicKeyFor, movedProvider, providerMoved, providerModuleOf, sayLeftOut, seatsOn, wireBuilds, zonesInTheMesh); in network.go generators, whoResolves, namesInTheMesh, onThePrivateNetwork; composedAndValidated, adoptionFor, adoptionOf, engineOpensVaultBox, namedModules, localNetworksOf, keepRecorded, passSeatsOn, theMeshPassesSeatsOn, assignmentsOf. Choosing (Reading, Allocating, Foreseeing) is gone: coreBoxesFor and coreBoxesOf take a plain allocating flag. composeForPush no longer takes the private network it ignored. The seat pass of a send is performSeatPasses, over the passes the composition names. Measured: cmd/mesh-controller non-test code 67,643 -> 65,821 lines (-1,822), its tests 57,691 -> 57,286, with the integration part of the equality test removed here because it calls the deleted functions. Not the issue's 3,000: that counts all of plan.go (2,192 lines), of which the callers, the verbs, the perform step and the sends remain (sendable, recorded builds, the held-back and ready-node logic, the plan verb, the gate's trial); and the 37 functions a name walk lists as unreachable are called through interfaces and method sets and are kept. Tests dropped, each with the mesh-sdk go/compose test that holds its cases: - seat_pass_test.go TestACompositionWithTwoClaimantsRecordsNoneAndSaysSo, TestACompositionChangesNothingWhileTheHolderIsAssignedOrNobodyClaims, TestAHolderAssignedButNotOnTheShelfIsNotTakenForGone: rest_test.go TestNoSeatIsPassedForTwoClaimantsAnAssignedHolderOrNoClaimant, TestAHolderAssignedButNotOnTheShelfIsNotTakenForGone, TestASeatWhoseHolderIsAssignedNowhereGoesToItsOnlyClaimant. TestACompositionPassesTheSeatAndWritesOneHandActByTheController and TestALostPassWritesNoActAndAFailedOneLeavesTheRecord stay as tests of the send's step (performSeatPasses); TestAThrowawayMeshPassesTheSeatInMemoryAndWritesNothing stays as TestAThrowawayMeshWritesNoHandActForAPass. - seat_pass_test.go TestNoSeatIsPassedWhenAMachinesAssignmentsCouldNotBeRead: no counterpart, and none is needed: the adapter reads every machine's assignments for the Input and a machine whose read fails fails the Input, so no seat is passed on a partial read. - network_test.go TestOnlyAMachineOnThePrivateNetworkIsNamed: network_test.go TestANodeNotOnThePrivateNetworkGetsNoAddressAndNoNetwork. - held_back_test.go TestASendCarriesTheCurrentBuildsAndALeftOutModuleKeepsItsOwn: node_test.go TestAModuleLeftOutKeepsTheBuildItWasLastSent (and compose_sdk_test.go's table, now literal). - modules_wire_test.go TestTheBuildOfACarriedCommitIsTheAssignmentsOrTheOneBuiltFromIt: node_test.go TestTheBodyCarriesTheOrderTheInputGivesAndTheBuildsOnlyToAnEngineThatReadsThem. - compose_equal_integration_test.go: the old path it compares against is deleted; its last run is the parent's try. Rewritten against mesh-sdk, same cases: issued_test.go (needs now come from compose.Resolve: Needed.IssuedToHolder and ProviderMoved), module_health_test.go and merge_gate_handing tests (the contract in the Input), provisioner_account_integration_test.go (the composition's refusal), one_resolution_integration_test.go (sayFound). Every test of the send, perform, the adapter and the verbs is kept; the tests that used planFor, declarationWith, generators, renderingFor or grantsFor as setup use resolveNode, composeSend, composeQuestion, renderingOf and grantsOf. compose_callers_test.go now fails when any deleted name is declared or called again. Committed by copying the files of a staging branch (stage/r4b-1389 at198be8217c, built fromfb556d6bby patch commits and compared with the author's worktree), so that this commit's parent isfb556d6b.
201 lines
7.4 KiB
Go
201 lines
7.4 KiB
Go
//go:build integration
|
|
|
|
package main
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"git.novox.be/novox/mesh-sdk/go/compose"
|
|
"github.com/novox/mesh-controller/internal/conditions"
|
|
"github.com/novox/mesh-controller/internal/inventory"
|
|
"github.com/novox/mesh-controller/internal/link"
|
|
)
|
|
|
|
// A module's stated health, as the controller keeps it and raises from it (novox/hq ADR 0240, "how it is
|
|
// checked", rule 4): one unhealthy statement raises nothing and is listed unconfirmed; two raise; a
|
|
// healthy one clears; a condition from before the send clears at the new build's start; an older
|
|
// statement is refused; and an engine that states nothing raises nothing.
|
|
|
|
var h0 = time.Date(2026, 10, 7, 12, 0, 0, 0, time.UTC)
|
|
|
|
func aStatement(at time.Time, states ...string) link.Health {
|
|
h := link.Health{Contract: link.LivenessContract, At: at}
|
|
for i, s := range states {
|
|
r := link.ResourceHealth{Module: "letta", Resource: "letta.server", Kind: "container", Target: "letta-server",
|
|
State: s, Since: at}
|
|
if i > 0 {
|
|
r.Module, r.Resource, r.Target = "mqtt", "mqtt.broker", "mosquitto.service"
|
|
}
|
|
if s == link.StateUnhealthy {
|
|
r.Reason, r.Restarts, r.Streak = "restarting", 4, 2
|
|
}
|
|
h.Resources = append(h.Resources, r)
|
|
}
|
|
return h
|
|
}
|
|
|
|
func TestTwoUnhealthyStatementsRaiseTheModulesConditionAndAHealthyOneClearsIt(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
inv := open.inventory
|
|
k := conditionsFrom
|
|
const key = "module.letta.anchor.unhealthy"
|
|
openKeys := func() []string {
|
|
t.Helper()
|
|
list, err := k.Open(ctx)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var keys []string
|
|
for _, c := range list {
|
|
keys = append(keys, c.Key)
|
|
}
|
|
return keys
|
|
}
|
|
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0, link.StateHealthy, link.StateHealthy), h0); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// One statement: nothing raised, and `node show` lists it as unconfirmed.
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0.Add(time.Minute), link.StateUnhealthy, link.StateHealthy),
|
|
h0.Add(time.Minute)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if keys := openKeys(); len(keys) != 0 {
|
|
t.Fatalf("one statement raised %v", keys)
|
|
}
|
|
kept, had, err := inv.HealthOf(ctx, "anchor")
|
|
if err != nil || !had {
|
|
t.Fatalf("the statement was not kept: %v %v", had, err)
|
|
}
|
|
if lines := strings.Join(healthLines(kept, had, h0.Add(time.Minute)), "\n"); !strings.Contains(lines, "unconfirmed") ||
|
|
!strings.Contains(lines, "letta.server") {
|
|
t.Fatalf("node show does not list the first statement as unconfirmed:\n%s", lines)
|
|
}
|
|
|
|
// The second in a row raises it — the module's own, never the other module's on the machine.
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0.Add(2*time.Minute), link.StateUnhealthy, link.StateHealthy),
|
|
h0.Add(2*time.Minute)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if keys := openKeys(); len(keys) != 1 || keys[0] != key {
|
|
t.Fatalf("two statements raised %v, not %s", keys, key)
|
|
}
|
|
c, _, _ := k.Get(ctx, key)
|
|
if c.Severity != conditions.Warning || c.Resolver != conditions.ResolverSelf || c.Subject.Machine != "anchor" ||
|
|
!strings.Contains(c.Summary, "letta on anchor") || !strings.Contains(c.Summary, "keeps restarting") ||
|
|
!strings.Contains(c.Evidence[0].Said, "letta-server") {
|
|
t.Fatalf("the condition does not say it in words with its evidence: %+v", c)
|
|
}
|
|
|
|
// Standing four hours, it is urgent.
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0.Add(5*time.Hour), link.StateUnhealthy, link.StateHealthy),
|
|
time.Now().Add(5*time.Hour)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if c, _, _ := k.Get(ctx, key); c.Severity != conditions.Urgent {
|
|
t.Fatalf("unhealthy for four hours is still %s", c.Severity)
|
|
}
|
|
|
|
// A new build's start — every start begins in `starting` — clears it: what follows is the new build's.
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0.Add(6*time.Hour), link.StateStarting, link.StateHealthy),
|
|
h0.Add(6*time.Hour)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if keys := openKeys(); len(keys) != 0 {
|
|
t.Fatalf("the first statement that says no resource is unhealthy did not clear it: %v", keys)
|
|
}
|
|
// And the streak starts again: one unhealthy statement after it raises nothing.
|
|
if err := stateHealth(ctx, inv, k, "anchor", aStatement(h0.Add(7*time.Hour), link.StateUnhealthy), h0.Add(7*time.Hour)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if keys := openKeys(); len(keys) != 0 {
|
|
t.Fatalf("one statement after a clearing raised %v", keys)
|
|
}
|
|
}
|
|
|
|
func TestAnOlderHealthStatementIsRefused(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
inv := open.inventory
|
|
before := healthRefused.Load()
|
|
if err := stateHealth(ctx, inv, nil, "anchor", aStatement(h0.Add(time.Minute), link.StateHealthy), h0); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// An event said before the report that overtook it arrives late.
|
|
if err := stateHealth(ctx, inv, nil, "anchor", aStatement(h0, link.StateUnhealthy), h0); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
kept, _, err := inv.HealthOf(ctx, "anchor")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !kept.SaidAt.Equal(h0.Add(time.Minute)) || kept.Resources[0].State != link.StateHealthy {
|
|
t.Fatalf("the older statement replaced the newer: %+v", kept)
|
|
}
|
|
if healthRefused.Load() != before+1 {
|
|
t.Fatalf("the refusal was not counted")
|
|
}
|
|
}
|
|
|
|
// **An engine older than the judging states nothing**: its reports raise nothing, keep nothing, and the
|
|
// gate judges its machine as before — never healthy for having said nothing, never unhealthy.
|
|
func TestAReportWithNoHealthRaisesAndKeepsNothing(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
l := nudgingListener{Enrolment: link.Enrolment{Inventory: open.inventory}}
|
|
if _, err := l.Heard(ctx, link.Report{Node: "anchor", Declared: "d1", Applied: []string{"letta.server"}}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, had, err := open.inventory.HealthOf(ctx, "anchor"); err != nil || had {
|
|
t.Fatalf("health kept for an engine that said none: %v %v", had, err)
|
|
}
|
|
if lines := healthLines(inventory.NodeHealth{}, false, time.Now()); !strings.Contains(lines[0], "older than the judging") {
|
|
t.Fatalf("node show: %v", lines)
|
|
}
|
|
// And one that does, through the report, is kept.
|
|
h := aStatement(time.Now().UTC(), link.StateHealthy)
|
|
if _, err := l.Heard(ctx, link.Report{Node: "anchor", Declared: "d1", Health: &h}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if kept, had, err := open.inventory.HealthOf(ctx, "anchor"); err != nil || !had || len(kept.Resources) != 1 {
|
|
t.Fatalf("the report's health was not kept: %+v %v %v", kept, had, err)
|
|
}
|
|
}
|
|
|
|
// A declared `health` is sent only to an engine whose own statement says it reads it (novox/hq ADR 0240
|
|
// Phase B): an older engine is strict and would refuse the whole declaration for the field.
|
|
func TestHealthIsSentOnlyToAnEngineThatSaysItReadsIt(t *testing.T) {
|
|
open := aMesh(t)
|
|
ctx := t.Context()
|
|
inv := open.inventory
|
|
reads := func() bool {
|
|
t.Helper()
|
|
in, err := readComposeInput(ctx, open)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
node, _ := nodeOf(in.Input, "anchor")
|
|
return node.Stated && node.Contract >= compose.ReadinessContract
|
|
}
|
|
if reads() {
|
|
t.Fatal("an engine that never stated anything is sent health")
|
|
}
|
|
if err := stateHealth(ctx, inv, nil, "anchor", aStatement(h0, link.StateHealthy), h0); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if reads() {
|
|
t.Fatal("an engine judging liveness alone is sent health")
|
|
}
|
|
later := aStatement(h0.Add(time.Minute), link.StateHealthy)
|
|
later.Contract = link.ReadinessContract
|
|
if err := stateHealth(ctx, inv, nil, "anchor", later, h0.Add(time.Minute)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !reads() {
|
|
t.Fatal("an engine that reads health is not sent it")
|
|
}
|
|
}
|