Skip to content

Commit 106c3ef

Browse files
authored
Merge pull request kubernetes#91544 from brianpursley/DeleteCollectionWorkers
Avoid creating more delete collection workers than items to delete
2 parents d1586ea + 88885b6 commit 106c3ef

File tree

1 file changed

+8
-1
lines changed
  • staging/src/k8s.io/apiserver/pkg/registry/generic/registry

1 file changed

+8
-1
lines changed

staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,12 +1006,19 @@ func (e *Store) DeleteCollection(ctx context.Context, deleteValidation rest.Vali
10061006
if err != nil {
10071007
return nil, err
10081008
}
1009+
if len(items) == 0 {
1010+
// Nothing to delete, return now
1011+
return listObj, nil
1012+
}
10091013
// Spawn a number of goroutines, so that we can issue requests to storage
10101014
// in parallel to speed up deletion.
1011-
// TODO: Make this proportional to the number of items to delete, up to
1015+
// It is proportional to the number of items to delete, up to
10121016
// DeleteCollectionWorkers (it doesn't make much sense to spawn 16
10131017
// workers to delete 10 items).
10141018
workersNumber := e.DeleteCollectionWorkers
1019+
if workersNumber > len(items) {
1020+
workersNumber = len(items)
1021+
}
10151022
if workersNumber < 1 {
10161023
workersNumber = 1
10171024
}

0 commit comments

Comments
 (0)