Merge pull request #38443 from NickrenREN/vol-mgr-getVolumeInUse

Automatic merge from submit-queue (batch tested with PRs 38443, 40145, 40701, 40682) fix GetVolumeInUse() function Since we just want to get volume name info, each volume name just need to added once. desiredStateOfWorld.GetVolumesToMount() will return volume and pod binding info, if one volume is mounted to several pods, the volume name will be return several times. That is not what we want in this function. We can add a new function to only get the volume name info or judge whether the volume name is added to the desiredVolumesMap array.

Merge pull request #38443 from NickrenREN/vol-mgr-getVolumeInUse
564016bd · Kubernetes Submit Queue · GitHub · f17010f5 · 3bb75064 · 564016bd
Commit 564016bd authored Jan 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 30, 2017
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

volume_manager.go pkg/kubelet/volumemanager/volume_manager.go +2 -0

No files found.
--- a/pkg/kubelet/volumemanager/volume_manager.go
+++ b/pkg/kubelet/volumemanager/volume_manager.go
@@ -299,10 +299,12 @@ func (vm *volumeManager) GetVolumesInUse() []v1.UniqueVolumeName {
 	for _, volume := range desiredVolumes {
 		if volume.PluginIsAttachable {
+			if _, exists := desiredVolumesMap[volume.VolumeName]; !exists {
 				desiredVolumesMap[volume.VolumeName] = true
 				volumesToReportInUse = append(volumesToReportInUse, volume.VolumeName)
 			}
 		}
+	}
 	for _, volume := range mountedVolumes {
 		if volume.PluginIsAttachable {