Merge pull request #52675 from mtanino/issue/52674
Automatic merge from submit-queue (batch tested with PRs 52675, 52691). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Fix FC WaitForAttach not mounting a volume **What this PR does / why we need it**: WaitForAttach failed consistently with this error: Heuristic determination of mount point failed:stat /var/lib/kubelet/plugins/kubernetes.io/fc/wwn-lun-0: no such file or directory We should create dir at first to avoid the error. **Which issue this PR fixes** : fixes #52674 **Special notes for your reviewer**: @rootfs @jsafrane **Release note**: ``` NONE ```
This commit is contained in:
commit
a3d92d0f82
@ -219,6 +219,10 @@ func (util *FCUtil) AttachDisk(b fcDiskMounter) (string, error) {
|
|||||||
}
|
}
|
||||||
// mount it
|
// mount it
|
||||||
globalPDPath := util.MakeGlobalPDName(*b.fcDisk)
|
globalPDPath := util.MakeGlobalPDName(*b.fcDisk)
|
||||||
|
if err := os.MkdirAll(globalPDPath, 0750); err != nil {
|
||||||
|
return devicePath, fmt.Errorf("fc: failed to mkdir %s, error", globalPDPath)
|
||||||
|
}
|
||||||
|
|
||||||
noMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath)
|
noMnt, err := b.mounter.IsLikelyNotMountPoint(globalPDPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return devicePath, fmt.Errorf("Heuristic determination of mount point failed:%v", err)
|
return devicePath, fmt.Errorf("Heuristic determination of mount point failed:%v", err)
|
||||||
@ -228,10 +232,6 @@ func (util *FCUtil) AttachDisk(b fcDiskMounter) (string, error) {
|
|||||||
return devicePath, nil
|
return devicePath, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := os.MkdirAll(globalPDPath, 0750); err != nil {
|
|
||||||
return devicePath, fmt.Errorf("fc: failed to mkdir %s, error", globalPDPath)
|
|
||||||
}
|
|
||||||
|
|
||||||
err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, nil)
|
err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return devicePath, fmt.Errorf("fc: failed to mount fc volume %s [%s] to %s, error %v", devicePath, b.fsType, globalPDPath, err)
|
return devicePath, fmt.Errorf("fc: failed to mount fc volume %s [%s] to %s, error %v", devicePath, b.fsType, globalPDPath, err)
|
||||||
|
Loading…
Reference in New Issue
Block a user