The rest of the mesh is quiet about a machine it resolved without the excluded one's offers
With one machine excluded, the others are resolved without its offers, and one that consumes them cannot resolve by design — the view is partial, the machine is not dropped. The line that names a dropped machine now speaks only for the whole-mesh view (seats), where a drop is a fault (hq 188).
This commit is contained in:
@@ -325,7 +325,12 @@ func theRestOfTheMesh(ctx context.Context, inv *inventory.Inventory,
|
|||||||
}
|
}
|
||||||
got, err := catalogue.Resolve(shelf, o.assigned, o.node, theirs)
|
got, err := catalogue.Resolve(shelf, o.assigned, o.node, theirs)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "%s is left out of the rest of the mesh: it does not resolve: %v\n", o.node.Name, err)
|
// Said only for the whole-mesh view. With one machine excluded, the others are
|
||||||
|
// resolved without its offers, and one that consumes them cannot resolve here by
|
||||||
|
// design — that is not the machine being dropped, it is the view being partial.
|
||||||
|
if exclude == "" {
|
||||||
|
fmt.Fprintf(os.Stderr, "%s is left out of the rest of the mesh: it does not resolve: %v\n", o.node.Name, err)
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
held = append(held, got.Claims...)
|
held = append(held, got.Claims...)
|
||||||
|
|||||||
Reference in New Issue
Block a user