Skip to content

Commit 18b5c4d

Browse files
authored
Merge pull request kubernetes#90283 from gaurav1086/scheduler_cleanup_map_deletion
[Scheduler] Improve complexity from O(logN) to O(1)
2 parents 5157383 + 31afb24 commit 18b5c4d

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pkg/scheduler/framework/plugins/nodevolumelimits/csi.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,8 @@ func (pl *CSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod *v
110110

111111
attachedVolumeCount := map[string]int{}
112112
for volumeUniqueName, volumeLimitKey := range attachedVolumes {
113-
if _, ok := newVolumes[volumeUniqueName]; ok {
114-
// Don't count single volume used in multiple pods more than once
115-
delete(newVolumes, volumeUniqueName)
116-
}
113+
// Don't count single volume used in multiple pods more than once
114+
delete(newVolumes, volumeUniqueName)
117115
attachedVolumeCount[volumeLimitKey]++
118116
}
119117

pkg/scheduler/framework/plugins/nodevolumelimits/non_csi.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,7 @@ func (pl *nonCSILimits) Filter(ctx context.Context, _ *framework.CycleState, pod
244244

245245
// filter out already-mounted volumes
246246
for k := range existingVolumes {
247-
if _, ok := newVolumes[k]; ok {
248-
delete(newVolumes, k)
249-
}
247+
delete(newVolumes, k)
250248
}
251249

252250
numNewVolumes := len(newVolumes)

0 commit comments

Comments
 (0)