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) + } +}