github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary union after call to GetPreferredAllocation()

Browse Source 
There is no need to try and allocate already-allocated devices again.
This commit is contained in:
Kevin Klues 2020-07-04 12:35:04 +00:00
parent 67ecc11c44
commit 26cb650655
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/cm/devicemanager/manager.go
View File

@ -709,7 +709,7 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi
if err != nil { if err != nil {
return nil, err return nil, err
} }
if allocateRemainingFrom(preferred.Intersection(aligned.Union(allocated))) { if allocateRemainingFrom(preferred.Intersection(aligned)) {
return allocated, nil return allocated, nil
} }
// Then fallback to allocate from the aligned set if no preferred list // Then fallback to allocate from the aligned set if no preferred list
@ -734,7 +734,7 @@ func (m *ManagerImpl) devicesToAllocate(podUID, contName, resource string, requi
if err != nil { if err != nil {
return nil, err return nil, err
} }
if allocateRemainingFrom(preferred.Intersection(available.Union(allocated))) { if allocateRemainingFrom(preferred.Intersection(available)) {
return allocated, nil return allocated, nil
} }