Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/node/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
24 changes: 24 additions & 0 deletions internal/node/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Loading