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

Merge pull request #87499 from ejweber/fc-mount-options

Browse Source 
FC mount options
This commit is contained in:
Kubernetes Prow Robot 2020-02-07 05:55:56 -08:00 committed by GitHub
commit c24fa741ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/volume/fc/attacher.go
View File

@ -217,20 +217,22 @@ func volumeSpecToMounter(spec *volume.Spec, host volume.VolumeHost) (*fcDiskMoun
} }
klog.V(5).Infof("fc: volumeSpecToMounter volumeMode %s", volumeMode) klog.V(5).Infof("fc: volumeSpecToMounter volumeMode %s", volumeMode)
return &fcDiskMounter{ return &fcDiskMounter{
fcDisk: fcDisk, fcDisk: fcDisk,
fsType: fc.FSType, fsType: fc.FSType,
volumeMode: volumeMode, volumeMode: volumeMode,
readOnly: readOnly, readOnly: readOnly,
mounter: volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host), mounter: volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()), deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
mountOptions: volumeutil.MountOptionFromSpec(spec),
}, nil }, nil
} }
return &fcDiskMounter{ return &fcDiskMounter{
fcDisk: fcDisk, fcDisk: fcDisk,
fsType: fc.FSType, fsType: fc.FSType,
readOnly: readOnly, readOnly: readOnly,
mounter: volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host), mounter: volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()), deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
mountOptions: volumeutil.MountOptionFromSpec(spec),
}, nil }, nil
} }

4
pkg/volume/fc/fc.go
View File

@ -93,7 +93,7 @@ func (plugin *fcPlugin) RequiresRemount() bool {
} }
func (plugin *fcPlugin) SupportsMountOption() bool { func (plugin *fcPlugin) SupportsMountOption() bool {
return false return true
} }
func (plugin *fcPlugin) SupportsBulkVolumeVerification() bool { func (plugin *fcPlugin) SupportsBulkVolumeVerification() bool {
@ -148,7 +148,7 @@ func (plugin *fcPlugin) newMounterInternal(spec *volume.Spec, podUID types.UID,
readOnly: readOnly, readOnly: readOnly,
mounter: &mount.SafeFormatAndMount{Interface: mounter, Exec: exec}, mounter: &mount.SafeFormatAndMount{Interface: mounter, Exec: exec},
deviceUtil: util.NewDeviceHandler(util.NewIOHandler()), deviceUtil: util.NewDeviceHandler(util.NewIOHandler()),
mountOptions: []string{}, mountOptions: util.MountOptionFromSpec(spec),
}, nil }, nil
} }
return &fcDiskMounter{ return &fcDiskMounter{

2
pkg/volume/fc/fc_util.go
View File

@ -268,7 +268,7 @@ func (util *fcUtil) AttachDisk(b fcDiskMounter) (string, error) {
return devicePath, nil return devicePath, nil
} }
err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, nil) err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, b.mountOptions)
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)
} }