Say a unit's restart count as what it counts, not since its state began (issue 458) #243

Merged
mesh-admin merged 3 commits from fix/458-restarts-say-what-they-count into main 2026-10-12 08:56:34 +00:00
2 changed files with 11 additions and 10 deletions
Showing only changes of commit 63079e2c67 - Show all commits
+7 -6
View File
@@ -497,7 +497,7 @@ func moduleUnhealthyObservation(module, node string, rs []inventory.ResourceHeal
continue
}
words = append(words, fmt.Sprintf("its %s %s %s", r.Kind, r.Resource, reasonWords(r)))
// The restart count is the unit's or container's whole life, never the time since (novox/hq issue 458).
// The restart count runs from the last start or creation, not from the state's since (novox/hq issue 458).
said = append(said, fmt.Sprintf("%s (%s %s): %s, since %s, %d look(s) in a row, %s",
r.Resource, r.Kind, r.Target, orNotSaid(r.Reason), r.Since.UTC().Format("2006-01-02 15:04:05 MST"),
r.Streak, restartsWords(r.Restarts)))
@@ -514,11 +514,12 @@ func moduleUnhealthyObservation(module, node string, rs []inventory.ResourceHeal
Resolved: fmt.Sprintf("%s works again on %s", module, node)}
}
// restartsWords is a restart count as what it is: the engine reads it from systemd's NRestarts or the
// runtime's restart count, which run over the unit's or container's whole life, so it is never said beside a
// "since" as if it counted from there (novox/hq issue 458).
// restartsWords is a restart count as what it is (novox/hq issue 458): the engine reads systemd's NRestarts,
// which counts only restarts its Restart= setting caused and resets when the unit is started by hand, or the
// runtime's RestartCount, which counts only restart-policy restarts and is lost when the container is
// recreated. So it counts automatic restarts since the last start or creation, never since a state's "since".
func restartsWords(n int) string {
return fmt.Sprintf("%d restart(s) over its whole life", n)
return fmt.Sprintf("%d automatic restart(s) since it was last started or created", n)
}
// reasonWords is why a resource is unhealthy, as a person reads it.
@@ -733,7 +734,7 @@ func healthLines(h inventory.NodeHealth, had bool, now time.Time) []string {
line += " — " + r.Reason
}
if r.Restarts > 0 {
line += ", " + restartsWords(r.Restarts) + ", not since then"
line += ", " + restartsWords(r.Restarts)
}
if r.State == link.StateUnhealthy && h.Streaks[r.Module] < moduleUnhealthyAfter {
line += " (unconfirmed: said once)"
+4 -4
View File
@@ -9,9 +9,9 @@ import (
"github.com/novox/mesh-controller/internal/link"
)
// A restart count runs over the unit's whole life, so it is never said beside "since" as if it counted from
// there (novox/hq issue 458): 3890 restarts beside "since 00:58" sent a reader after a crash loop that was not.
func TestARestartCountSaysItIsTheWholeLife(t *testing.T) {
// A restart count runs from the unit's last start or creation, so it is never said beside "since" as if it
// counted from there (novox/hq issue 458): 3890 restarts beside "since 00:58" sent a reader after a crash loop that was not.
func TestARestartCountSaysItCountsFromTheLastStart(t *testing.T) {
since := time.Date(2026, 10, 11, 0, 58, 0, 0, time.UTC)
r := inventory.ResourceHealth{Module: "messenger", Resource: "messenger.own-runtime", Kind: "process",
Target: "messenger-runtime.service", State: link.StateUnhealthy, Reason: "restarting", Since: since,
@@ -21,7 +21,7 @@ func TestARestartCountSaysItIsTheWholeLife(t *testing.T) {
lines := strings.Join(healthLines(h, true, since.Add(time.Minute)), "\n")
o := moduleUnhealthyObservation("messenger", "anchor", []inventory.ResourceHealth{r})
for name, said := range map[string]string{"node show": lines, "evidence": o.Said, "summary": o.Summary} {
if !strings.Contains(said, "3890 restart(s) over its whole life") || strings.Contains(said, "counted") {
if !strings.Contains(said, "3890 automatic restart(s) since it was last started or created") || strings.Contains(said, "counted") {
t.Errorf("%s says the restart count as if it were since then:\n%s", name, said)
}
}