power: bound every shutdown at ten minutes, not systemd's thirty (issue 1126)
mesh/delivery merged: source.main moved to novox/mesh-catalog@58309a972945
mesh/delivery-group group fix/shutdown-bound merged: every member is merged
mesh/check pass 6724dab0cf96 on 387ee59140c4 | unit 2192 run, 3794 kept, 57 skipped | integration 2208 run, 3829 kept, 57 skipped | over bound: unit, …
mesh/delivery merged: source.main moved to novox/mesh-catalog@58309a972945
mesh/delivery-group group fix/shutdown-bound merged: every member is merged
mesh/check pass 6724dab0cf96 on 387ee59140c4 | unit 2192 run, 3794 kept, 57 skipped | integration 2208 run, 3829 kept, 57 skipped | over bound: unit, …
On ace's reboot of 2026-10-28 every unit had stopped within 17 s, yet the bus and polkit were started again during the shutdown, nothing stopped them a second time, and the reboot waited on reboot.target's 30-minute job timeout, silent, until the operator forced it. node-power owns the shutdown on every machine, so its drop-ins on reboot, poweroff and halt shorten the bound; each target keeps its own forcing action, so the last phase still ends every process, unmounts and syncs. The cause, node-tools starting bundles again while it stops, is fixed in mesh-tools.
This commit is contained in:
@@ -127,3 +127,53 @@ func TestTheBarBlocksAreTwoItemsOfTheBarsCollection(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// A shutdown is bounded at ten minutes, not systemd's thirty (issue 1126, ace's reboot of 2026-10-28): every unit had
|
||||
// stopped within 17 s, yet the bus and the authorization manager were started again during the shutdown, nothing
|
||||
// stopped them a second time, and the reboot waited on its job's own timeout of 30 min with nothing on the console.
|
||||
// The bound keeps each target's own forcing action (reboot-force and the like): systemd's last phase still ends
|
||||
// every process, unmounts and syncs. Ten minutes stays above the longest stop the catalogue declares (120 s) chained.
|
||||
func TestEveryShutdownIsBoundedAtTenMinutes(t *testing.T) {
|
||||
raw, err := os.ReadFile("../../module.json")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var m struct {
|
||||
Resources []map[string]any `json:"resources"`
|
||||
}
|
||||
if err := json.Unmarshal(raw, &m); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
byPath := map[string]map[string]any{}
|
||||
for _, r := range m.Resources {
|
||||
if p, ok := r["path"].(string); ok {
|
||||
byPath[p] = r
|
||||
}
|
||||
}
|
||||
for _, target := range []string{"reboot", "poweroff", "halt"} {
|
||||
dir := "/etc/systemd/system/" + target + ".target.d"
|
||||
if d := byPath[dir]; d == nil || d["type"] != "directory" || d["unknown"] != "program" {
|
||||
t.Errorf("%s: no directory resource %s whose unknown files are the program's: %v", target, dir, d)
|
||||
}
|
||||
f := byPath[dir+"/mesh-power.conf"]
|
||||
if f == nil || f["type"] != "file" {
|
||||
t.Errorf("%s: no file resource %s/mesh-power.conf", target, dir)
|
||||
continue
|
||||
}
|
||||
name, _ := f["template"].(string)
|
||||
text, err := os.ReadFile(filepath.Join("../..", name))
|
||||
if err != nil {
|
||||
t.Errorf("%s: %v", target, err)
|
||||
continue
|
||||
}
|
||||
var lines []string
|
||||
for _, l := range strings.Split(string(text), "\n") {
|
||||
if l != "" && !strings.HasPrefix(l, "#") {
|
||||
lines = append(lines, l)
|
||||
}
|
||||
}
|
||||
if strings.Join(lines, "\n") != "[Unit]\nJobTimeoutSec=10min" {
|
||||
t.Errorf("%s: %s sets %q, want only [Unit] JobTimeoutSec=10min (the target keeps its own action)", target, name, lines)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user