Let a requirement be optional, binding only a provider that already runs (hq issue 166, ADR 0330)
mesh/merge-gate out of date: judged against trunk 56d6313262e8, the trunk is now cbac703e817d; judged again on a recheck or when it is merged
mesh/repo-check out of date: judged against trunk 56d6313262e8, the trunk is now cbac703e817d; judged again on a recheck or when it is merged
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate out of date: judged against trunk 56d6313262e8, the trunk is now cbac703e817d; judged again on a recheck or when it is merged
mesh/repo-check out of date: judged against trunk 56d6313262e8, the trunk is now cbac703e817d; judged again on a recheck or when it is merged
mesh/delivery superseded: a newer head of the same pull request
Making every soft dependency a provision made it hard: a mesh without influxdb could not assign
grafana, and one with influxdb in its catalogue would install it for grafana. A requirement may now
be written {"name": ..., "optional": true}. It resolves as a hard one when a provider is assigned or
reachable, and is otherwise absent: never refused, nothing installed for it. Its binding, credential
and only-when-bound files are left out, its ${bound:...|default:...} placeholders take their
defaults, the module check refuses one that could render empty, and plan and node list it unbound.
This commit is contained in:
@@ -183,6 +183,10 @@ type Resolution struct {
|
||||
// that keeps its data, and did not (novox/hq ADR 0232): it stays bound where its data is, and the
|
||||
// controller raises an urgent condition naming the move until a person pins one or the other.
|
||||
Kept []KeptBinding
|
||||
// Absent is every optional requirement of this node's modules that nothing assigned answers
|
||||
// (novox/hq ADR 0330 §3): left unbound rather than refused, with nothing installed for it, and
|
||||
// listed by `plan` and `node` (§7). It binds on the first composition after a provider is assigned.
|
||||
Absent []Absent
|
||||
}
|
||||
|
||||
// Unhostable is one directly-assigned module the machine cannot run.
|
||||
@@ -374,12 +378,70 @@ func Resolve(catalogue map[string]Manifest, assigned []string, node Node, world
|
||||
// identical lines before realising there is none.
|
||||
reported := map[string]bool{}
|
||||
|
||||
for len(queue) > 0 {
|
||||
// **An optional requirement is settled last** (novox/hq ADR 0330). Whether a name is optional is
|
||||
// a question about every module that wants it, and a module pulled in later may want it hard; so
|
||||
// a name only optional modules want so far is put aside until the walk has nothing else, and only
|
||||
// then, if still nobody wants it hard, settled by the optional rule: bound to a provider that is
|
||||
// already assigned or reachable, exactly as a hard one, and otherwise absent — never refused,
|
||||
// and never answered by installing anything.
|
||||
var deferred []string
|
||||
settling := map[string]bool{}
|
||||
absent := map[string]bool{}
|
||||
wantedHard := func(want string) bool {
|
||||
for _, name := range order {
|
||||
if catalogue[name].wantsHard(want) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
wantedOptionally := func(want string) bool {
|
||||
for _, name := range order {
|
||||
if catalogue[name].IsOptional(want) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
leaveAbsent := func(want string) {
|
||||
absent[want] = true
|
||||
reported[want] = true
|
||||
}
|
||||
|
||||
for {
|
||||
if len(queue) == 0 {
|
||||
if len(deferred) == 0 {
|
||||
break
|
||||
}
|
||||
// What a module chosen since wants hard goes back to the walk, which may install for
|
||||
// it; only when none does is the rest settled, since settling installs nothing and so
|
||||
// can change no other name's answer.
|
||||
var hard, optional []string
|
||||
for _, d := range deferred {
|
||||
if wantedHard(d) {
|
||||
hard = append(hard, d)
|
||||
} else {
|
||||
optional = append(optional, d)
|
||||
}
|
||||
}
|
||||
if len(hard) > 0 {
|
||||
queue, deferred = hard, optional
|
||||
continue
|
||||
}
|
||||
for _, d := range optional {
|
||||
settling[d] = true
|
||||
}
|
||||
queue, deferred = optional, nil
|
||||
}
|
||||
want := queue[0]
|
||||
queue = queue[1:]
|
||||
if chosen[want] || reported[want] {
|
||||
continue
|
||||
}
|
||||
if !settling[want] && because[want] != "assigned" && !wantedHard(want) && wantedOptionally(want) {
|
||||
deferred = append(deferred, want)
|
||||
continue
|
||||
}
|
||||
// Already answered by something in the set. This is the case that makes assigning zsh do
|
||||
// what a person meant by it.
|
||||
//
|
||||
@@ -483,6 +545,12 @@ func Resolve(catalogue map[string]Manifest, assigned []string, node Node, world
|
||||
if brokered[want] {
|
||||
reported[want] = true
|
||||
where := world.Offered[want]
|
||||
if settling[want] && len(where) == 0 {
|
||||
// Nothing assigned anywhere answers it: absent, and nothing is put on a machine
|
||||
// for it (ADR 0330 §3), however few modules in the catalogue could.
|
||||
leaveAbsent(want)
|
||||
continue
|
||||
}
|
||||
names := providerNames(where)
|
||||
take := func(p Provider) {
|
||||
if node.At != "" && p.At == "" || node.At == "" && p.At != "" || node.At == "" && p.At == "" {
|
||||
@@ -579,6 +647,10 @@ func Resolve(catalogue map[string]Manifest, assigned []string, node Node, world
|
||||
// research 026 found. Another node's provider never counts — node scope is never brokered.
|
||||
if machineReach[want] && !isModule(catalogue, want) {
|
||||
reported[want] = true
|
||||
if settling[want] {
|
||||
leaveAbsent(want)
|
||||
continue
|
||||
}
|
||||
if world.Unchecked {
|
||||
// The first pass's refusals take a machine off the network; the second says it.
|
||||
continue
|
||||
@@ -591,6 +663,13 @@ func Resolve(catalogue map[string]Manifest, assigned []string, node Node, world
|
||||
}
|
||||
|
||||
candidates := offers[want]
|
||||
if settling[want] && !(len(candidates) == 0 && len(world.Licences[want]) > 0) {
|
||||
// Not answered by anything in this node's set, and only installing could answer it
|
||||
// here — which is never done for an optional requirement (ADR 0330 §3), not even
|
||||
// for the only candidate. A licence record still answers it, in the post-pass.
|
||||
leaveAbsent(want)
|
||||
continue
|
||||
}
|
||||
switch len(candidates) {
|
||||
case 0:
|
||||
if len(world.Licences[want]) > 0 {
|
||||
@@ -724,7 +803,8 @@ func Resolve(catalogue map[string]Manifest, assigned []string, node Node, world
|
||||
resolution := Resolution{Node: node.Name, At: node.At, PublicDomain: node.PublicDomain,
|
||||
Account: node.Account, AccountHome: node.AccountHome, AgentAccount: node.AgentAccount,
|
||||
AgentAccountHome: node.AgentAccountHome, Capabilities: node.Capabilities,
|
||||
Because: because, Needs: needs, Unhostable: unhostable, Kept: kept}
|
||||
Because: because, Needs: needs, Unhostable: unhostable, Kept: kept,
|
||||
Absent: absentOf(absent, order, catalogue)}
|
||||
for _, n := range providersFirst(order, catalogue) {
|
||||
resolution.Modules = append(resolution.Modules, catalogue[n])
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user