mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-04 11:07:35 +01:00
admin: credit an unitemized slot to a pending job only after a later heartbeat (#12385)
* admin: credit an unitemized slot to a pending job only after a later heartbeat A pending reservation the worker does not list took one of the slots the worker counts without itemizing, even when that heartbeat came before the reservation and could not have counted the job. The slot belonged to unknown work, so the admin undercounted it and could admit one job too many, past a job type's per-worker limit, until the next heartbeat. A reservation now records when it was made, and claims an unitemized slot only from a heartbeat received at or after that time. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: time unitemized-slot credit by the heartbeat, not the last hello A reconnect's hello moves LastSeenAt but keeps the old heartbeat, so a pending reservation could claim a slot counted before it existed, and a completed job's echo could end without a new heartbeat. Record when the heartbeat itself arrived and compare reservations against that. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * admin: a completed job claims no slot from a heartbeat before its reservation A job that completes before any heartbeat counts it has no echo, so the slot the last heartbeat counted is other work. Crediting it to the job's type let another job type pass its per-worker limit until the next heartbeat. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
995084f71e
commit
cd82e663ad
3 files changed
+87
-9
No files matched your search
@@ -1656,6 +1656,78 @@ func TestExecutorCapacityStopsCreditingACompletedJobAfterTheNextHeartbeat(t *tes
|
||||
}
|
||||
}
|
||||
|
||||
// A count-only heartbeat taken before a reservation cannot count that job,
|
||||
// so the slot it counted is still unknown work rather than the new job's.
|
||||
// A reconnect's hello keeps that heartbeat and does not change this.
|
||||
func TestExecutorCapacityKeepsSlotsCountedBeforeAReservation(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
pluginSvc, err := New(Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
defer pluginSvc.Shutdown()
|
||||
|
||||
const workerID = "worker-a"
|
||||
hello := &plugin_pb.WorkerHello{
|
||||
WorkerId: workerID,
|
||||
Capabilities: []*plugin_pb.JobTypeCapability{
|
||||
{JobType: "vacuum", CanExecute: true, MaxExecutionConcurrency: 4},
|
||||
},
|
||||
}
|
||||
pluginSvc.registry.UpsertFromHello(hello)
|
||||
policy := schedulerPolicy{PerWorkerConcurrency: 2}
|
||||
oneUsed := &plugin_pb.WorkerHeartbeat{WorkerId: workerID, ExecutionSlotsUsed: 1, ExecutionSlotsTotal: 4}
|
||||
pluginSvc.registry.UpdateHeartbeat(workerID, oneUsed)
|
||||
if _, _, err := pluginSvc.reserveExecutorByID("vacuum", policy, workerID, "vacuum-1"); err != nil {
|
||||
t.Fatalf("reserve vacuum-1: %v", err)
|
||||
}
|
||||
pluginSvc.registry.UpsertFromHello(hello)
|
||||
|
||||
executor, _ := pluginSvc.registry.Get(workerID)
|
||||
if pluginSvc.executorHasCapacity(executor, "vacuum", policy) {
|
||||
t.Fatalf("the slot counted before vacuum-1 was reserved may hold vacuum work")
|
||||
}
|
||||
pluginSvc.registry.UpdateHeartbeat(workerID, oneUsed)
|
||||
executor, _ = pluginSvc.registry.Get(workerID)
|
||||
if !pluginSvc.executorHasCapacity(executor, "vacuum", policy) {
|
||||
t.Fatalf("a heartbeat after the reservation counts vacuum-1 itself")
|
||||
}
|
||||
}
|
||||
|
||||
// A job that completes before any heartbeat counts it has no echo: the slot
|
||||
// the last heartbeat counted is still unknown work, not the job's.
|
||||
func TestExecutorCapacityKeepsSlotsCountedBeforeACompletedJob(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
pluginSvc, err := New(Options{})
|
||||
if err != nil {
|
||||
t.Fatalf("New: %v", err)
|
||||
}
|
||||
defer pluginSvc.Shutdown()
|
||||
|
||||
const workerID = "worker-a"
|
||||
pluginSvc.registry.UpsertFromHello(&plugin_pb.WorkerHello{
|
||||
WorkerId: workerID,
|
||||
Capabilities: []*plugin_pb.JobTypeCapability{
|
||||
{JobType: "vacuum", CanExecute: true, MaxExecutionConcurrency: 4},
|
||||
{JobType: "balance", CanExecute: true, MaxExecutionConcurrency: 4},
|
||||
},
|
||||
})
|
||||
oneUsed := &plugin_pb.WorkerHeartbeat{WorkerId: workerID, ExecutionSlotsUsed: 1, ExecutionSlotsTotal: 4}
|
||||
pluginSvc.registry.UpdateHeartbeat(workerID, oneUsed)
|
||||
_, release, err := pluginSvc.reserveExecutorByID("vacuum", schedulerPolicy{PerWorkerConcurrency: 2}, workerID, "vacuum-1")
|
||||
if err != nil {
|
||||
t.Fatalf("reserve vacuum-1: %v", err)
|
||||
}
|
||||
release()
|
||||
|
||||
executor, _ := pluginSvc.registry.Get(workerID)
|
||||
if pluginSvc.executorHasCapacity(executor, "balance", schedulerPolicy{PerWorkerConcurrency: 1}) {
|
||||
t.Fatalf("the slot counted before vacuum-1 was reserved may hold balance work")
|
||||
}
|
||||
}
|
||||
|
||||
// The reason a dispatch gives up names every holder of the worker's slots,
|
||||
// the unitemized ones included.
|
||||
func TestCapacityReasonNamesUnitemizedSlots(t *testing.T) {
|
||||
|
||||
Reference in new issue
Block a user