From 7f7d720a7d1bfc4b74533f30fd747ab642719c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=8E=AE=E6=96=87?= Date: Mon, 27 May 2024 15:16:36 +0800 Subject: [PATCH] kubelet/volumemanager: simplify GetVolumesInUse remove the map[v1.UniqueVolumeName]bool allocation and also accelerate this func. --- pkg/kubelet/volumemanager/volume_manager.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/volumemanager/volume_manager.go b/pkg/kubelet/volumemanager/volume_manager.go index 6dfcf92f0af..9335c6b18f7 100644 --- a/pkg/kubelet/volumemanager/volume_manager.go +++ b/pkg/kubelet/volumemanager/volume_manager.go @@ -351,27 +351,21 @@ func (vm *volumeManager) GetVolumesInUse() []v1.UniqueVolumeName { desiredVolumes := vm.desiredStateOfWorld.GetVolumesToMount() allAttachedVolumes := vm.actualStateOfWorld.GetAttachedVolumes() volumesToReportInUse := make([]v1.UniqueVolumeName, 0, len(desiredVolumes)+len(allAttachedVolumes)) - desiredVolumesMap := make(map[v1.UniqueVolumeName]bool, len(desiredVolumes)+len(allAttachedVolumes)) for _, volume := range desiredVolumes { if volume.PluginIsAttachable { - if _, exists := desiredVolumesMap[volume.VolumeName]; !exists { - desiredVolumesMap[volume.VolumeName] = true - volumesToReportInUse = append(volumesToReportInUse, volume.VolumeName) - } + volumesToReportInUse = append(volumesToReportInUse, volume.VolumeName) } } for _, volume := range allAttachedVolumes { if volume.PluginIsAttachable { - if _, exists := desiredVolumesMap[volume.VolumeName]; !exists { - volumesToReportInUse = append(volumesToReportInUse, volume.VolumeName) - } + volumesToReportInUse = append(volumesToReportInUse, volume.VolumeName) } } slices.Sort(volumesToReportInUse) - return volumesToReportInUse + return slices.Compact(volumesToReportInUse) } func (vm *volumeManager) ReconcilerStatesHasBeenSynced() bool {