Adding CSI Spec v1.6.0 support for Powerflex

README.md

@@ -10,7 +10,7 @@
 ## Description
 CSI Driver for PowerFlex is part of the [CSM (Container Storage Modules)](https://github.com/dell/csm) open-source suite of Kubernetes storage enablers for Dell products. CSI Driver for PowerFlex is a Container Storage Interface (CSI) driver that provides support for provisioning persistent storage using Dell PowerFlex storage array. 
 
-It supports CSI specification version 1.5.
+It supports CSI specification version 1.6.
 
 This project may be compiled as a stand-alone binary using Golang that, when run, provides a valid CSI endpoint. It also can be used as a precompiled container image.
 

go.mod

@@ -7,15 +7,15 @@ go 1.21
 
 require (
 	github.com/akutz/memconn v0.1.0
-	github.com/container-storage-interface/spec v1.5.0
+	github.com/container-storage-interface/spec v1.6.0
 	github.com/cucumber/godog v0.12.1
 	github.com/dell/dell-csi-extensions/common v1.2.0
 	github.com/dell/dell-csi-extensions/podmon v1.2.0
 	github.com/dell/dell-csi-extensions/replication v1.5.0
 	github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.3.0
 	github.com/dell/gocsi v1.8.0
 	github.com/dell/gofsutil v1.13.1
-	github.com/dell/goscaleio v1.12.0
+	github.com/dell/goscaleio v1.12.1-0.20231017093409-11580d24020f
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/golang/protobuf v1.5.3
 	github.com/google/uuid v1.3.0

go.sum

@@ -80,8 +80,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/container-storage-interface/spec v1.2.0/go.mod h1:6URME8mwIBbpVyZV93Ce5St17xBiQJQY67NDsuohiy4=
-github.com/container-storage-interface/spec v1.5.0 h1:lvKxe3uLgqQeVQcrnL2CPQKISoKjTJxojEs9cBk+HXo=
-github.com/container-storage-interface/spec v1.5.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
+github.com/container-storage-interface/spec v1.6.0 h1:vwN9uCciKygX/a0toYryoYD5+qI9ZFeAMuhEEKO+JBA=
+github.com/container-storage-interface/spec v1.6.0/go.mod h1:8K96oQNkJ7pFcC2R9Z1ynGGBB1I93kcS6PGg3SsOk8s=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
@@ -114,8 +114,8 @@ github.com/dell/gocsi v1.8.0 h1:0qsC/Ts6QeAWBBVaQvFrZYBXdoR7bmjrDUb3QpcMfHM=
 github.com/dell/gocsi v1.8.0/go.mod h1:X/8Ll8qqKAKCenmd1gPJMUvUmgY8cK0LiS8Pck12UaU=
 github.com/dell/gofsutil v1.13.1 h1:hu26rfykH0gvpSxPe5lTBVCHZA3m896/iO+2Ekz0U7A=
 github.com/dell/gofsutil v1.13.1/go.mod h1:UPRuS1blrPnfT2K3nWRrLHIosZsBznDglovA6DRMmUI=
-github.com/dell/goscaleio v1.12.0 h1:9KbctTsxqgVG+9Lj9NDwb4wvjzO7YMZ7uDzps4LlX2E=
-github.com/dell/goscaleio v1.12.0/go.mod h1:dt4Xy5Pnx8MEBza+ODOKiwNFBipcnzEXWgTnFy0+jTw=
+github.com/dell/goscaleio v1.12.1-0.20231017093409-11580d24020f h1:FKJw+2Ouz0n2zenyeUo3tuLIjhFopCrUWyS8BC3NvsU=
+github.com/dell/goscaleio v1.12.1-0.20231017093409-11580d24020f/go.mod h1:dt4Xy5Pnx8MEBza+ODOKiwNFBipcnzEXWgTnFy0+jTw=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=

service/controller.go

@@ -1,4 +1,4 @@
-// Copyright © 2019-2022 Dell Inc. or its subsidiaries. All Rights Reserved.
+// Copyright © 2019-2023 Dell Inc. or its subsidiaries. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,12 +20,14 @@
 	"net/http"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/dell/goscaleio"
@@ -104,7 +106,7 @@
 	// bytesInGiB is the number of bytes in a gibibyte
 	bytesInGiB = kiBytesInGiB * bytesInKiB
 
 	//VolumeIDList is the list of volume IDs
 	VolumeIDList = "VolumeIDList"
 
 	removeModeOnlyMe                    = "ONLY_ME"
@@ -117,9 +119,9 @@
 	errUnknownAccessType                = "unknown access type is not Block or Mount"
 	errUnknownAccessMode                = "access mode cannot be UNKNOWN"
 	errNoMultiNodeWriter                = "multi-node with writer(s) only supported for block access type"
 	//TRUE means "true" (comment put in for lint check)
 	TRUE = "TRUE"
 	//FALSE means "false" (comment put in for lint check)
 	FALSE = "FALSE"
 
 	sioReplicationGroupExists = "The Replication Consistency Group already exists"
@@ -141,14 +143,14 @@
 	HeaderCSIPluginIdentifier = "x-csi-plugin-id"
 )
 
 var (
 	interestingParameters = [...]string{0: "FsType", 1: KeyMkfsFormatOption, 2: KeyBandwidthLimitInKbps, 3: KeyIopsLimit}
 )
 
 func (s *service) CreateVolume(
 	ctx context.Context,
 	req *csi.CreateVolumeRequest) (
 	*csi.CreateVolumeResponse, error) {
 
 	params := req.GetParameters()
 
@@ -1678,7 +1680,7 @@
 
 func valVolumeCaps(
 	vcs []*csi.VolumeCapability,
 	vol *siotypes.Volume) (bool, string) {
 
 	var (
 		supported = true
@@ -2091,6 +2093,11 @@
 	return capacity, nil
 }
 
+// maxVolumesSizeForArray - store the maxVolumesSizeForArray
+var maxVolumesSizeForArray = make(map[string]int64)
+
+var mutex = &sync.Mutex{}
+
 func (s *service) GetCapacity(
 	ctx context.Context,
 	req *csi.GetCapacityRequest) (
@@ -2101,6 +2108,7 @@
 		err      error
 	)
 
+	systemID := ""
 	params := req.GetParameters()
 	if params == nil || len(params) == 0 {
 		// Get capacity of all systems
@@ -2111,7 +2119,6 @@
 		if !ok {
 			Log.Printf("Protection Domain name not provided; there could be conflicts if two storage pools share a name")
 		}
-		systemID := ""
 		for key, value := range params {
 			if strings.EqualFold(key, KeySystemID) {
 				systemID = value
@@ -2132,14 +2139,82 @@
 			"Unable to get capacity: %s", err.Error())
 	}
 
+	if systemID == "" && s.opts.defaultSystemID != "" {
+		systemID = s.opts.defaultSystemID
+	}
+
+	if systemID == "" {
+		return &csi.GetCapacityResponse{
+			AvailableCapacity: capacity,
+		}, nil
+	}
+
+	maxVolSize, err := s.getMaximumVolumeSize(systemID)
+	if err != nil {
+		Log.Debug("GetMaxVolumeSize returning error ", err)
+	}
+
+	if maxVolSize < 0 {
+		return &csi.GetCapacityResponse{
+			AvailableCapacity: capacity,
+		}, nil
+	}
+
+	maxVolSizeinBytes := maxVolSize * bytesInGiB
+	maxVol := wrapperspb.Int64(maxVolSizeinBytes)
 	return &csi.GetCapacityResponse{
 		AvailableCapacity: capacity,
+		MaximumVolumeSize: maxVol,
 	}, nil
 }
 
+func (s *service) getMaximumVolumeSize(systemID string) (int64, error) {
+	valueInCache, found := getCachedMaximumVolumeSize(systemID)
+	if !found || valueInCache < 0 {
+		adminClient := s.adminClients[systemID]
+		if adminClient == nil {
+			return 0, status.Errorf(codes.InvalidArgument, "can't find adminClient by id %s", systemID)
+		}
+
+		vol1, err := adminClient.GetMaxVol()
+		if err != nil {
+			Log.Debug("GetMaxVolumeSize returning error ", err)
+			return 0, err
+		}
+
+		value, err := strconv.ParseInt(vol1, 10, 64)
+		if err != nil {
+			Log.Debug("error converting str to int ", err)
+			return 0, err
+
+		}
+
+		cacheMaximumVolumeSize(systemID, value)
+		valueInCache = value
+
+	}
+	return valueInCache, nil
+
+}
+
+func getCachedMaximumVolumeSize(key string) (int64, bool) {
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	value, found := maxVolumesSizeForArray[key]
+	return value, found
+}
+
+func cacheMaximumVolumeSize(key string, value int64) {
+	mutex.Lock()
+	defer mutex.Unlock()
+
+	maxVolumesSizeForArray[key] = value
+}
+
 func (s *service) ControllerGetCapabilities(
 	ctx context.Context,
 	req *csi.ControllerGetCapabilitiesRequest) (
 	*csi.ControllerGetCapabilitiesResponse, error) {
 
 	capabilities := []*csi.ControllerServiceCapability{
@@ -2256,7 +2331,7 @@
 }
 
 // systemProbe will probe the given array
 func (s *service) systemProbe(ctx context.Context, array *ArrayConnectionData) error {
 
 	// Check that we have the details needed to login to the Gateway
 	if array.Endpoint == "" {
@@ -2713,8 +2788,8 @@
 // DeleteSnapshotConsistencyGroup is called when we wish to delete an entire CG
 // of snapshots. We retrieve all the volumes and determine if any are in use.
 func (s *service) DeleteSnapshotConsistencyGroup(
 	ctx context.Context, snapVol *siotypes.Volume,
 	req *csi.DeleteSnapshotRequest, adminClient *goscaleio.Client) (
 	*csi.DeleteSnapshotResponse, error) {
 
 	cgVols := make([]*siotypes.Volume, 0)
@@ -3086,7 +3161,7 @@
 
 // ControllerGetVolume fetch current information about a volume
 // returns volume condition if found else returns not found
 func (s *service) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
 
 	abnormal := false
 	csiVolID := req.GetVolumeId()