From 68a0dfcaedddb4473d00ab9beffab0f96c85022d Mon Sep 17 00:00:00 2001 From: Matthew Mattox Date: Sat, 24 Oct 2026 14:34:19 -0500 Subject: [PATCH] fix(node): take back this host's slot when it goes stale between scans Register checks this host's failed slots, then waits on its live-looking slots from other PID namespaces, then takes the first empty or failed slot. A slot that crossed the staleness threshold between the first scan and the wait was neither claimed nor watched, so Register took an empty slot and left the old journal to failure detection 20s later. TestRegisterTakesOtherPIDNamespaceSlotOnceStale hit this in CI. Register now rechecks every slot for this host's failed ones after the wait. Co-Authored-By: Claude Opus 5.5 --- internal/node/registry.go | 3 ++- internal/node/registry_test.go | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/internal/node/registry.go b/internal/node/registry.go index 3b91de65..78ffe056 100644 --- a/internal/node/registry.go +++ b/internal/node/registry.go @@ -215,7 +215,8 @@ func (r *Registry) Register(ctx context.Context, hostname string) (int, error) { if i, err := r.claimFirst(allSlots(), ownFailed); i >= 0 || err != nil { return i, err } - if i, err := r.claimFirst(r.awaitOtherNamespaceSlots(), ownFailed); i >= 0 || err != nil { + // A slot can go stale between scans, so recheck every slot after the wait. + if i, err := r.claimFirst(append(r.awaitOtherNamespaceSlots(), allSlots()...), ownFailed); i >= 0 || err != nil { return i, err } i, err := r.claimFirst(allSlots(), func(slot *Slot) bool { diff --git a/internal/node/registry_test.go b/internal/node/registry_test.go index 31aeb40c..96e933a7 100644 --- a/internal/node/registry_test.go +++ b/internal/node/registry_test.go @@ -1012,3 +1012,27 @@ func TestLeaseCheckRenewsAndDetectsLoss(t *testing.T) { t.Errorf("CheckLease after another node took over: err = %v, want ErrLeaseLost", err) } } + +func TestRegisterTakesOwnSlotThatGoesStaleWhileWaiting(t *testing.T) { + dev, cleanup := createTestDevice(t, 10<<20) + defer cleanup() + + reg := NewRegistry(dev, 0) + if reg.bootID == ([16]byte{}) || reg.pidNS == 0 { + t.Skip("no kernel boot ID or PID namespace") + } + previous := writeOtherNamespaceSlot(t, reg, 2, time.Now()) + go func() { + time.Sleep(600 * time.Millisecond) + previous.HeartbeatTime = time.Now().Add(-2 * HeartbeatTimeout).Unix() + reg.writeSlot(2, previous) + }() + + slot, err := reg.Register(context.Background(), "node") + if err != nil { + t.Fatalf("Register: %v", err) + } + if slot != 2 { + t.Errorf("Register took slot %d, want slot 2, which went stale after the first scan", slot) + } +}