Merge pull request #82123 from xiaoanyunfei/cleanup/take-effect-stateofworld-hashmap

replace iteration with hashmap in *state_of_world

pkg/controller/volume/attachdetach/cache/actual_state_of_world.go

@@ -569,13 +569,10 @@ func (asw *actualStateOfWorld) GetAttachedVolumesForNode(
 	attachedVolumes := make(
 		[]AttachedVolume, 0 /* len */, len(asw.attachedVolumes) /* cap */)
 	for _, volumeObj := range asw.attachedVolumes {
-		for actualNodeName, nodeObj := range volumeObj.nodesAttachedTo {
+		if nodeObj, nodeExists := volumeObj.nodesAttachedTo[nodeName]; nodeExists {
-			if actualNodeName == nodeName {
 			attachedVolumes = append(
 				attachedVolumes,
 				getAttachedVolume(&volumeObj, &nodeObj))
-				break
-			}
 		}
 	}
 
@@ -610,9 +607,9 @@ func (asw *actualStateOfWorld) GetNodesForAttachedVolume(volumeName v1.UniqueVol
 	}
 
 	nodes := []types.NodeName{}
-	for k, nodesAttached := range volumeObj.nodesAttachedTo {
+	for nodeName, nodesAttached := range volumeObj.nodesAttachedTo {
 		if nodesAttached.attachedConfirmed {
-			nodes = append(nodes, k)
+			nodes = append(nodes, nodeName)
 		}
 	}
 	return nodes
@@ -627,14 +624,14 @@ func (asw *actualStateOfWorld) GetVolumesToReportAttached() map[types.NodeName][
 		if nodeToUpdateObj.statusUpdateNeeded {
 			attachedVolumes := make(
 				[]v1.AttachedVolume,
+				0,
 				len(nodeToUpdateObj.volumesToReportAsAttached) /* len */)
-			i := 0
 			for _, volume := range nodeToUpdateObj.volumesToReportAsAttached {
-				attachedVolumes[i] = v1.AttachedVolume{
+				attachedVolumes = append(attachedVolumes,
+					v1.AttachedVolume{
 						Name:       volume,
 						DevicePath: asw.attachedVolumes[volume].devicePath,
-				}
+					})
-				i++
 			}
 			volumesToReportAttached[nodeToUpdateObj.nodeName] = attachedVolumes
 		}

pkg/kubelet/volumemanager/cache/actual_state_of_world.go

@@ -492,11 +492,7 @@ func (asw *actualStateOfWorld) MarkRemountRequired(
 	asw.Lock()
 	defer asw.Unlock()
 	for volumeName, volumeObj := range asw.attachedVolumes {
-		for mountedPodName, podObj := range volumeObj.mountedPods {
+		if podObj, podExists := volumeObj.mountedPods[podName]; podExists {
-			if mountedPodName != podName {
-				continue
-			}
-
 			volumePlugin, err :=
 				asw.volumePluginMgr.FindPluginBySpec(podObj.volumeSpec)
 			if err != nil || volumePlugin == nil {
@@ -523,14 +519,14 @@ func (asw *actualStateOfWorld) MarkFSResizeRequired(
 	podName volumetypes.UniquePodName) {
 	asw.Lock()
 	defer asw.Unlock()
-	volumeObj, exist := asw.attachedVolumes[volumeName]
+	volumeObj, volumeExists := asw.attachedVolumes[volumeName]
-	if !exist {
+	if !volumeExists {
 		klog.Warningf("MarkFSResizeRequired for volume %s failed as volume not exist", volumeName)
 		return
 	}
 
-	podObj, exist := volumeObj.mountedPods[podName]
+	podObj, podExists := volumeObj.mountedPods[podName]
-	if !exist {
+	if !podExists {
 		klog.Warningf("MarkFSResizeRequired for volume %s failed "+
 			"as pod(%s) not exist", volumeName, podName)
 		return
@@ -648,8 +644,8 @@ func (asw *actualStateOfWorld) VolumeExistsWithSpecName(podName volumetypes.Uniq
 	asw.RLock()
 	defer asw.RUnlock()
 	for _, volumeObj := range asw.attachedVolumes {
-		for name, podObj := range volumeObj.mountedPods {
+		if podObj, podExists := volumeObj.mountedPods[podName]; podExists {
-			if podName == name && podObj.volumeSpec.Name() == volumeSpecName {
+			if podObj.volumeSpec.Name() == volumeSpecName {
 				return true
 			}
 		}
@@ -687,14 +683,12 @@ func (asw *actualStateOfWorld) GetMountedVolumesForPod(
 	defer asw.RUnlock()
 	mountedVolume := make([]MountedVolume, 0 /* len */, len(asw.attachedVolumes) /* cap */)
 	for _, volumeObj := range asw.attachedVolumes {
-		for mountedPodName, podObj := range volumeObj.mountedPods {
+		if podObj, podExists := volumeObj.mountedPods[podName]; podExists {
-			if mountedPodName == podName {
 			mountedVolume = append(
 				mountedVolume,
 				getMountedVolume(&podObj, &volumeObj))
 		}
 	}
-	}
 
 	return mountedVolume
 }

pkg/kubelet/volumemanager/cache/desired_state_of_world.go

@@ -362,8 +362,8 @@ func (dsw *desiredStateOfWorld) VolumeExistsWithSpecName(podName types.UniquePod
 	dsw.RLock()
 	defer dsw.RUnlock()
 	for _, volumeObj := range dsw.volumesToMount {
-		for name, podObj := range volumeObj.podsToMount {
+		if podObj, podExists := volumeObj.podsToMount[podName]; podExists {
-			if podName == name && podObj.volumeSpec.Name() == volumeSpecName {
+			if podObj.volumeSpec.Name() == volumeSpecName {
 				return true
 			}
 		}
@@ -378,11 +378,9 @@ func (dsw *desiredStateOfWorld) GetPods() map[types.UniquePodName]bool {
 	podList := make(map[types.UniquePodName]bool)
 	for _, volumeObj := range dsw.volumesToMount {
 		for podName := range volumeObj.podsToMount {
-			if !podList[podName] {
 			podList[podName] = true
 		}
 	}
-	}
 	return podList
 }