version mismatch catch
This commit is contained in:
1 parent
3ba96528bb
commit
a90653260a
11 files changed
+181
-34
No files matched your search
@@ -350,6 +350,9 @@ func (b *Bot) command(ctx context.Context, m incoming) bool {
|
||||
switch {
|
||||
case verb == "" || verb == "help" && args == "":
|
||||
reply = helpText
|
||||
if warning := b.versionWarning(ctx); warning != "" {
|
||||
reply = warning + "\n\n" + reply
|
||||
}
|
||||
case verb == "sessions" && args == "":
|
||||
reply = b.sessionList(ctx, ownerID)
|
||||
case verb == "status" && args == "":
|
||||
@@ -478,10 +481,14 @@ func (b *Bot) postStatus(ctx context.Context, channel, thread, ownerID string, k
|
||||
}
|
||||
fmt.Fprintf(&sb, "*Stops when unused for:* %s\n", b.describeIdle(u))
|
||||
fmt.Fprintf(&sb, "*Home folder:* %s\n", b.describeStorage(ctx, u))
|
||||
sb.WriteString("*Nodes:*")
|
||||
views, _ := b.mgr.Views(ctx)
|
||||
if warning := versionWarning(b.mgr.LocalName(), views); warning != "" {
|
||||
sb.WriteString(warning + "\n")
|
||||
}
|
||||
sb.WriteString("*Nodes:*")
|
||||
masterVersion, _ := versionMismatches(b.mgr.LocalName(), views)
|
||||
for _, v := range views {
|
||||
sb.WriteString("\n• " + describeNode(v))
|
||||
sb.WriteString("\n• " + describeNode(v) + versionNote(b.mgr.LocalName(), masterVersion, v))
|
||||
}
|
||||
for _, name := range b.mgr.OfflineNodes() {
|
||||
fmt.Fprintf(&sb, "\n• %s: offline", name)
|
||||
@@ -917,9 +924,14 @@ func (b *Bot) nodesList(ctx context.Context, ownerID string) string {
|
||||
here = u.Node
|
||||
}
|
||||
var sb strings.Builder
|
||||
master := b.mgr.LocalName()
|
||||
if warning := versionWarning(master, views); warning != "" {
|
||||
sb.WriteString(warning + "\n\n")
|
||||
}
|
||||
sb.WriteString("*Nodes* (what's free on each):")
|
||||
masterVersion, _ := versionMismatches(master, views)
|
||||
for _, v := range views {
|
||||
sb.WriteString("\n• " + describeNode(v))
|
||||
sb.WriteString("\n• " + describeNode(v) + versionNote(master, masterVersion, v))
|
||||
if v.Name == here {
|
||||
sb.WriteString(" ← this container")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
package bot
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"slackerbot/internal/balance"
|
||||
)
|
||||
|
||||
const unknownVersion = "an older version that doesn't report one"
|
||||
|
||||
func versionLabel(version string) string {
|
||||
if version == "" {
|
||||
return unknownVersion
|
||||
}
|
||||
return "`" + version + "`"
|
||||
}
|
||||
|
||||
func versionMismatches(master string, views []balance.NodeView) (masterVersion string, odd []balance.NodeView) {
|
||||
for _, v := range views {
|
||||
if v.Name == master {
|
||||
masterVersion = v.Version
|
||||
}
|
||||
}
|
||||
for _, v := range views {
|
||||
if v.Name != master && v.Version != masterVersion {
|
||||
odd = append(odd, v)
|
||||
}
|
||||
}
|
||||
return masterVersion, odd
|
||||
}
|
||||
|
||||
func versionWarning(master string, views []balance.NodeView) string {
|
||||
masterVersion, odd := versionMismatches(master, views)
|
||||
if len(odd) == 0 {
|
||||
return ""
|
||||
}
|
||||
var sb strings.Builder
|
||||
fmt.Fprintf(&sb, ":warning: *Version mismatch.* The master (%s) runs %s, but", master, versionLabel(masterVersion))
|
||||
for i, v := range odd {
|
||||
if i > 0 {
|
||||
sb.WriteString(",")
|
||||
}
|
||||
fmt.Fprintf(&sb, " %s runs %s", v.Name, versionLabel(v.Version))
|
||||
}
|
||||
sb.WriteString(". Update the nodes so they all run the same version.")
|
||||
return sb.String()
|
||||
}
|
||||
|
||||
func (b *Bot) versionWarning(ctx context.Context) string {
|
||||
if b.mgr == nil {
|
||||
return ""
|
||||
}
|
||||
views, err := b.mgr.Views(ctx)
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return versionWarning(b.mgr.LocalName(), views)
|
||||
}
|
||||
|
||||
func versionNote(master string, masterVersion string, v balance.NodeView) string {
|
||||
if v.Name == master || v.Version == masterVersion {
|
||||
return ""
|
||||
}
|
||||
return " · :warning: version " + versionLabel(v.Version)
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
package bot
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"slackerbot/internal/balance"
|
||||
"slackerbot/internal/testutil/clustertest"
|
||||
)
|
||||
|
||||
func TestVersionWarning(t *testing.T) {
|
||||
views := func(versions ...string) []balance.NodeView {
|
||||
names := []string{"master", "a", "b"}
|
||||
var out []balance.NodeView
|
||||
for i, v := range versions {
|
||||
out = append(out, balance.NodeView{Name: names[i], Version: v})
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
if got := versionWarning("master", views("v1", "v1", "v1")); got != "" {
|
||||
t.Fatalf("matching versions should not warn: %q", got)
|
||||
}
|
||||
if got := versionWarning("master", views("v1")); got != "" {
|
||||
t.Fatalf("a lone master should not warn: %q", got)
|
||||
}
|
||||
|
||||
got := versionWarning("master", views("v1", "v2", "v1"))
|
||||
if !strings.Contains(got, "Version mismatch") || !strings.Contains(got, "a runs `v2`") || strings.Contains(got, "b runs") {
|
||||
t.Fatalf("only the odd node should be named: %q", got)
|
||||
}
|
||||
|
||||
got = versionWarning("master", views("v1", ""))
|
||||
if !strings.Contains(got, "a runs an older version that doesn't report one") {
|
||||
t.Fatalf("a slave reporting no version is a mismatch: %q", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestVersionMismatchShownInNodesAndHelp(t *testing.T) {
|
||||
c := clustertest.New(t)
|
||||
b := &Bot{cfg: c.Cfg, store: c.Store, mgr: c.Mgr}
|
||||
|
||||
if got := b.nodesList(c.Ctx, "C1"); strings.Contains(got, "Version mismatch") {
|
||||
t.Fatalf("unexpected warning when no node reports a version: %s", got)
|
||||
}
|
||||
|
||||
c.Master.Mu.Lock()
|
||||
c.Master.Version = "2026.11.01-abc"
|
||||
c.Master.Mu.Unlock()
|
||||
|
||||
got := b.nodesList(c.Ctx, "C1")
|
||||
if !strings.Contains(got, "Version mismatch") || !strings.Contains(got, "slave-1 runs an older version") {
|
||||
t.Fatalf("nodes should flag the mismatch: %s", got)
|
||||
}
|
||||
if !strings.Contains(got, ":warning: version") {
|
||||
t.Fatalf("the odd node's line should be flagged: %s", got)
|
||||
}
|
||||
if help := b.versionWarning(c.Ctx); !strings.Contains(help, "Version mismatch") {
|
||||
t.Fatalf("help should flag the mismatch: %s", help)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user