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

k8s-ci-robot · web-flow · commit c24fa741ae92 · 2020-02-07T05:55:56.000-08:00
FC mount options
diff --git a/pkg/volume/fc/attacher.go b/pkg/volume/fc/attacher.go
@@ -217,20 +217,22 @@ func volumeSpecToMounter(spec *volume.Spec, host volume.VolumeHost) (*fcDiskMoun
 		}
 		klog.V(5).Infof("fc: volumeSpecToMounter volumeMode %s", volumeMode)
 		return &fcDiskMounter{
-			fcDisk:     fcDisk,
-			fsType:     fc.FSType,
-			volumeMode: volumeMode,
-			readOnly:   readOnly,
-			mounter:    volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
-			deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
+			fcDisk:       fcDisk,
+			fsType:       fc.FSType,
+			volumeMode:   volumeMode,
+			readOnly:     readOnly,
+			mounter:      volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
+			deviceUtil:   volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
+			mountOptions: volumeutil.MountOptionFromSpec(spec),
 		}, nil
 	}
 	return &fcDiskMounter{
-		fcDisk:     fcDisk,
-		fsType:     fc.FSType,
-		readOnly:   readOnly,
-		mounter:    volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
-		deviceUtil: volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
+		fcDisk:       fcDisk,
+		fsType:       fc.FSType,
+		readOnly:     readOnly,
+		mounter:      volumeutil.NewSafeFormatAndMountFromHost(fcPluginName, host),
+		deviceUtil:   volumeutil.NewDeviceHandler(volumeutil.NewIOHandler()),
+		mountOptions: volumeutil.MountOptionFromSpec(spec),
 	}, nil
 }
 
diff --git a/pkg/volume/fc/fc.go b/pkg/volume/fc/fc.go
@@ -93,7 +93,7 @@ func (plugin *fcPlugin) RequiresRemount() bool {
 }
 
 func (plugin *fcPlugin) SupportsMountOption() bool {
-	return false
+	return true
 }
 
 func (plugin *fcPlugin) SupportsBulkVolumeVerification() bool {
@@ -148,7 +148,7 @@ func (plugin *fcPlugin) newMounterInternal(spec *volume.Spec, podUID types.UID,
 			readOnly:     readOnly,
 			mounter:      &mount.SafeFormatAndMount{Interface: mounter, Exec: exec},
 			deviceUtil:   util.NewDeviceHandler(util.NewIOHandler()),
-			mountOptions: []string{},
+			mountOptions: util.MountOptionFromSpec(spec),
 		}, nil
 	}
 	return &fcDiskMounter{
diff --git a/pkg/volume/fc/fc_util.go b/pkg/volume/fc/fc_util.go
@@ -268,7 +268,7 @@ func (util *fcUtil) AttachDisk(b fcDiskMounter) (string, error) {
 		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 {
 		return devicePath, fmt.Errorf("fc: failed to mount fc volume %s [%s] to %s, error %v", devicePath, b.fsType, globalPDPath, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ func (plugin *fcPlugin) RequiresRemount() bool {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`func (plugin *fcPlugin) SupportsMountOption() bool {`
`96`		`- return false`
	`96`	`+ return true`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`func (plugin *fcPlugin) SupportsBulkVolumeVerification() bool {`
`@@ -148,7 +148,7 @@ func (plugin fcPlugin) newMounterInternal(spec volume.Spec, podUID types.UID,`
`148`	`148`	`readOnly: readOnly,`
`149`	`149`	`mounter: &mount.SafeFormatAndMount{Interface: mounter, Exec: exec},`
`150`	`150`	`deviceUtil: util.NewDeviceHandler(util.NewIOHandler()),`
`151`		`- mountOptions: []string{},`
	`151`	`+ mountOptions: util.MountOptionFromSpec(spec),`
`152`	`152`	`}, nil`
`153`	`153`	`}`
`154`	`154`	`return &fcDiskMounter{`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ func (util *fcUtil) AttachDisk(b fcDiskMounter) (string, error) {`
`268`	`268`	`return devicePath, nil`
`269`	`269`	`}`
`270`	`270`
`271`		`- err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, nil)`
	`271`	`+ err = b.mounter.FormatAndMount(devicePath, globalPDPath, b.fsType, b.mountOptions)`
`272`	`272`	`if err != nil {`
`273`	`273`	`return devicePath, fmt.Errorf("fc: failed to mount fc volume %s [%s] to %s, error %v", devicePath, b.fsType, globalPDPath, err)`
`274`	`274`	`}`