github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicated check of device path in aws attacher

Browse Source
This commit is contained in:
mlmhl 2018-01-18 12:36:14 +08:00
parent b7100f1ee7
commit edd66c9bdf
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/volume/aws_ebs/attacher.go
View File

@ -168,19 +168,15 @@ func (attacher *awsElasticBlockStoreAttacher) WaitForAttach(spec *volume.Spec, d
select { select {
case <-ticker.C: case <-ticker.C:
glog.V(5).Infof("Checking AWS Volume %q is attached.", volumeID) glog.V(5).Infof("Checking AWS Volume %q is attached.", volumeID)
if devicePath != "" { devicePaths := getDiskByIdPaths(aws.KubernetesVolumeID(volumeSource.VolumeID), partition, devicePath)
devicePaths := getDiskByIdPaths(aws.KubernetesVolumeID(volumeSource.VolumeID), partition, devicePath) path, err := verifyDevicePath(devicePaths)
path, err := verifyDevicePath(devicePaths) if err != nil {
if err != nil { // Log error, if any, and continue checking periodically. See issue #11321
// Log error, if any, and continue checking periodically. See issue #11321 glog.Errorf("Error verifying AWS Volume (%q) is attached: %v", volumeID, err)
glog.Errorf("Error verifying AWS Volume (%q) is attached: %v", volumeID, err) } else if path != "" {
} else if path != "" { // A device path has successfully been created for the PD
// A device path has successfully been created for the PD glog.Infof("Successfully found attached AWS Volume %q.", volumeID)
glog.Infof("Successfully found attached AWS Volume %q.", volumeID) return path, nil
return path, nil
}
} else {
glog.V(5).Infof("AWS Volume (%q) is not attached yet", volumeID)
} }
case <-timer.C: case <-timer.C:
return "", fmt.Errorf("Could not find attached AWS Volume %q. Timeout waiting for mount paths to be created.", volumeID) return "", fmt.Errorf("Could not find attached AWS Volume %q. Timeout waiting for mount paths to be created.", volumeID)