github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix device mountable volume names in DSW

Browse Source
This commit is contained in:
Yecheng Fu 2018-11-30 17:03:56 +08:00
parent fad23990ce
commit f5642bbe88
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/volumemanager/cache/desired_state_of_world.go vendored
View File

@ -203,11 +203,12 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
var volumeName v1.UniqueVolumeName var volumeName v1.UniqueVolumeName
// The unique volume name used depends on whether the volume is attachable // The unique volume name used depends on whether the volume is attachable/device-mountable
// or not. // or not.
attachable := dsw.isAttachableVolume(volumeSpec) attachable := dsw.isAttachableVolume(volumeSpec)
if attachable { deviceMountable := dsw.isDeviceMountableVolume(volumeSpec)
// For attachable volumes, use the unique volume name as reported by if attachable || deviceMountable {
// For attachable/device-mountable volumes, use the unique volume name as reported by
// the plugin. // the plugin.
volumeName, err = volumeName, err =
util.GetUniqueVolumeNameFromSpec(volumePlugin, volumeSpec) util.GetUniqueVolumeNameFromSpec(volumePlugin, volumeSpec)
@ -219,13 +220,11 @@ func (dsw *desiredStateOfWorld) AddPodToVolume(
err) err)
} }
} else { } else {
// For non-attachable volumes, generate a unique name based on the pod // For non-attachable and non-device-mountable volumes, generate a unique name based on the pod
// namespace and name and the name of the volume within the pod. // namespace and name and the name of the volume within the pod.
volumeName = util.GetUniqueVolumeNameForNonAttachableVolume(podName, volumePlugin, volumeSpec) volumeName = util.GetUniqueVolumeNameForNonAttachableVolume(podName, volumePlugin, volumeSpec)
} }
deviceMountable := dsw.isDeviceMountableVolume(volumeSpec)
if _, volumeExists := dsw.volumesToMount[volumeName]; !volumeExists { if _, volumeExists := dsw.volumesToMount[volumeName]; !volumeExists {
dsw.volumesToMount[volumeName] = volumeToMount{ dsw.volumesToMount[volumeName] = volumeToMount{
volumeName: volumeName, volumeName: volumeName,