Added support for SoftQuotaPct volume parameter

This feature is N/A for EFAAS

Change-Id: I26448838c77494ee51f79c76e34a289aa3d3e903

deploy/templates/storageclass.yaml

@@ -24,9 +24,10 @@ parameters: # Note - only string values are accepted in parameters
   permissions: "777"
   # Default volume size
   defaultVolumeSize: "100GiB"
-
   # Volume access. Supported values: read_write, read_only, list_only, no_access
   access: "read_write"
+  # Volume capacity percentage to be used as the soft quota. Default: 100
+  softQuotaPct: "75"
 
   # === eFaaS options ===
 

src/ecfs/controllerserver.go

@@ -42,7 +42,7 @@ func getCreateVolumeResponse(volumeId volumeHandleType, volOptions *volumeOption
 	return &csi.CreateVolumeResponse{
 		Volume: &csi.Volume{
 			VolumeId:      string(volumeId),
-			CapacityBytes: int64(volOptions.Capacity),
+			CapacityBytes: volOptions.Capacity,
 			VolumeContext: req.GetParameters(),
 		},
 	}

src/ecfs/volume.go

@@ -67,9 +67,8 @@ func exportExists(emsClient *emanageClient, exportName string, opt *volumeOption
 
 func createDc(emsClient *emanageClient, opt *volumeOptions) (*emanage.DataContainer, error) {
 	dc, err := emsClient.DataContainers.Create(string(opt.VolumeId), dcPolicy, &emanage.DcCreateOpts{
-		// TODO: Consider setting soft quota at a %% of capacity (to be set via storageclass)
-		SoftQuota:      int(opt.Capacity),
-		HardQuota:      int(opt.Capacity),
+		HardQuota:      opt.Capacity,
+		SoftQuota:      opt.Capacity * int64(opt.SoftQuotaPct) / 100,
 		DirPermissions: opt.ExportPermissions,
 	})
 	return &dc, err

src/ecfs/volumeoptions.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"fmt"
 	"strconv"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
@@ -46,6 +47,7 @@ type volumeOptions struct {
 	ExportGid         optional.Int
 	Access            string // read_write/read_only/list_only/no_access
 	ClientRules       string // [{"sourceRange":  "all", "accessRights": "readWrite"}]
+	SoftQuotaPct      int    // Capacity percentage to be used as a soft quota
 }
 
 func extractOptionString(paramName StorageClassCustomParameter, options map[string]string) (value string, err error) {
@@ -70,6 +72,7 @@ const (
 	DefaultVolumeSize StorageClassCustomParameter = "defaultVolumeSize"
 	Access            StorageClassCustomParameter = "access"
 	ClientRules       StorageClassCustomParameter = "clientRules"
+	SoftQuotaPct      StorageClassCustomParameter = "softQuotaPct"
 )
 
 // newVolumeOptions translates CreateVolumeRequest parameters to volumeOptions
@@ -174,6 +177,18 @@ func newVolumeOptions(req *csi.CreateVolumeRequest) (*volumeOptions, error) {
 	}
 	opts.ClientRules = paramStr
 
+	// SoftQuotaPct
+	if paramStr, err = extractOptionString(SoftQuotaPct, volParams); err != nil {
+		paramStr = "100"
+	}
+	if opts.SoftQuotaPct, err = strconv.Atoi(paramStr); err != nil {
+		return nil, errors.Wrap(err, 0)
+	}
+	if opts.SoftQuotaPct < 0 || opts.SoftQuotaPct > 100 {
+		return nil, errors.WrapPrefix(err, fmt.Sprintf(
+			"Invalid soft quota percentage: %v", opts.SoftQuotaPct), 0)
+	}
+
 	glog.V(log.DEBUG).Infof("ecfs: Current volume options: %+v", opts)
 	return opts, nil
 }