The restart-on rename reads both list shapes
A resource composed in code carries restart-on as []string; the rename only read []any, so the overlay's registry-trust reload kept its bare reference, pointed at nothing, and the runtime was never restarted — the trust was on disk and not in the daemon, with every check passing. Diagnosed on the built-store-cross-node bed, run 8 (issues 042/048).
This commit is contained in:
@@ -484,16 +484,7 @@ func (r Resolution) Declaration(with Rendering) ([]map[string]any, error) {
|
||||
// the daemon's. Written `<module>.<id>`, and a dot is what marks it as already
|
||||
// answered: prefixing it again would point at nothing, silently, and the daemon would
|
||||
// serve the old names for ever while everything reported success.
|
||||
if reflects, ok := resource["restart-on"].([]any); ok {
|
||||
var renamed []any
|
||||
for _, id := range reflects {
|
||||
named := fmt.Sprint(id)
|
||||
if strings.Contains(named, ".") {
|
||||
renamed = append(renamed, named)
|
||||
continue
|
||||
}
|
||||
renamed = append(renamed, m.Module+"."+named)
|
||||
}
|
||||
if renamed := reflectsRenamed(m.Module, resource["restart-on"]); renamed != nil {
|
||||
copied["restart-on"] = renamed
|
||||
}
|
||||
out = append(out, copied)
|
||||
@@ -566,6 +557,36 @@ type Contribution struct {
|
||||
// Named after both. Named after the machine alone, two modules on one node wrote to one path: the
|
||||
// second overwrote the first, and the provisioner — reading a directory — saw one consumer where
|
||||
// there were two.
|
||||
// reflectsRenamed is a resource's restart-on list under the module's prefix, or nil when it has
|
||||
// none. It reads both the shape JSON parsing produces ([]any) and the shape code composing
|
||||
// resources natively produces ([]string): a reference that was skipped because its list arrived
|
||||
// in the other shape would point at nothing — silently, with the service never restarting and
|
||||
// every check passing, which is how a runtime kept serving without the registry trust its
|
||||
// daemon file already carried.
|
||||
func reflectsRenamed(module string, reflects any) []any {
|
||||
var names []string
|
||||
switch v := reflects.(type) {
|
||||
case []any:
|
||||
for _, id := range v {
|
||||
names = append(names, fmt.Sprint(id))
|
||||
}
|
||||
case []string:
|
||||
names = v
|
||||
}
|
||||
if names == nil {
|
||||
return nil
|
||||
}
|
||||
var renamed []any
|
||||
for _, named := range names {
|
||||
if strings.Contains(named, ".") {
|
||||
renamed = append(renamed, named)
|
||||
continue
|
||||
}
|
||||
renamed = append(renamed, module+"."+named)
|
||||
}
|
||||
return renamed
|
||||
}
|
||||
|
||||
func grantPath(directory, consumer, module string) string {
|
||||
return strings.TrimRight(directory, "/") + "/" + consumer + "." + module + ".secret"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user