added storageclass param fabrics (#244)

* added storageclass param fabrics

* get the target type from sbcli controlplane

* get the target type from sbcli controlplane

* updated param from fabrics to fabric

* updated param from fabrics to fabric

* load nvme-rdma module in csi-node

* use lowercase for fabric name

* use lowercase for fabric name

* log targetType

* update name targetType in the volumeContext

* set default lvol_priority_class to 0

* feat: add topology-aware multicluster provisioning support

* added neccessary import

* fix merge conflict

---------

Co-authored-by: Manohar Reddy <manohar@simplyblock.io>

Author: geoffrey1330

charts/spdk-csi/latest/spdk-csi/templates/node.yaml

@@ -96,6 +96,7 @@ spec:
                 [
                   "/bin/sh", "-c",
                   "modprobe nvme-tcp || echo failed to modprobe nvme-tcp && \
+                  modprobe nvme-rdma || echo failed to modprobe nvme-rdma && \
                   if [ ! -f /var/lib/nvme/hostid ]; then uuidgen > /var/lib/nvme/hostid; fi && \
                   cp /var/lib/nvme/hostid /etc/nvme/hostid && \
                   echo \"nqn.2014-08.org.nvmexpress:uuid:$(cat /etc/nvme/hostid)\" > /etc/nvme/hostnqn"

charts/spdk-csi/latest/spdk-csi/templates/storageclass.yaml

@@ -21,6 +21,7 @@ parameters:
   distr_ndcs: "{{ .Values.logicalVolume.numDataChunks }}"
   distr_npcs: "{{ .Values.logicalVolume.numParityChunks }}"
   lvol_priority_class: "{{ .Values.logicalVolume.lvol_priority_class }}"
+  fabric: "{{ .Values.logicalVolume.fabric }}"
   max_namespace_per_subsys: "{{ .Values.logicalVolume.max_namespace_per_subsys }}"
   tune2fs_reserved_blocks: "{{ .Values.logicalVolume.tune2fs_reserved_blocks }}"
 {{- if .Values.storageclass.zoneClusterMap }}

charts/spdk-csi/latest/spdk-csi/values.yaml

@@ -123,6 +123,7 @@ logicalVolume:
   lvol_priority_class: "0"
   max_namespace_per_subsys: "1"
   tune2fs_reserved_blocks: "0"
+  fabric: tcp
 
 podAnnotations: {}
 

pkg/spdk/controllerserver.go

@@ -500,6 +500,7 @@ func prepareCreateVolumeReq(ctx context.Context, req *csi.CreateVolumeRequest, s
 		LvolName:     req.GetName(),
 		Size:         fmt.Sprintf("%dM", sizeMiB),
 		LvsName:      params["pool_name"],
+		Fabric:       params["fabric"],
 		MaxRWIOPS:    params["qos_rw_iops"],
 		MaxRWmBytes:  params["qos_rw_mbytes"],
 		MaxRmBytes:   params["qos_r_mbytes"],

pkg/util/initiator.go

@@ -38,7 +38,8 @@ const (
 	DevDiskByID = "/dev/disk/by-id/*%s*"
 
 	// TargetTypeNVMf is the target type for NVMe over Fabrics
-	TargetTypeNVMf = "tcp"
+	TargetTypeTCP  = "tcp"
+	TargetTypeRDMA = "rdma"
 
 	// TargetTypeISCSI is the target type for cache
 	TargetTypeCache = "cache"
@@ -165,8 +166,9 @@ func NewsimplyBlockClient(clusterID string) (*NodeNVMf, error) {
 // NewSpdkCsiInitiator creates a new SpdkCsiInitiator based on the target type
 func NewSpdkCsiInitiator(volumeContext map[string]string) (SpdkCsiInitiator, error) {
 	targetType := strings.ToLower(volumeContext["targetType"])
+	klog.Infof("Simplyblock targetType created :%s", targetType)
 	switch targetType {
-	case TargetTypeNVMf:
+	case TargetTypeTCP, TargetTypeRDMA:
 		var connections []connectionInfo
 
 		err := json.Unmarshal([]byte(volumeContext["connections"]), &connections)
@@ -772,7 +774,7 @@ func fetchLvolConnection(spdkNode *NodeNVMf, lvolID string) ([]*LvolConnectResp,
 
 func connectViaNVMe(conn *LvolConnectResp, ctrlLossTmo int) error {
 	cmd := []string{
-		"nvme", "connect", "-t", "tcp",
+		"nvme", "connect", "-t", conn.TargetType,
 		"-a", conn.IP, "-s", strconv.Itoa(conn.Port),
 		"-n", conn.Nqn,
 		"-l", strconv.Itoa(ctrlLossTmo),

pkg/util/jsonrpc.go

@@ -112,6 +112,7 @@ type LvolConnectResp struct {
 	NrIoQueues     int    `json:"nr-io-queues"`
 	CtrlLossTmo    int    `json:"ctrl-loss-tmo"`
 	Port           int    `json:"port"`
+	TargetType     string `json:"transport"`
 	IP             string `json:"ip"`
 	Connect        string `json:"connect"`
 	NSID           int    `json:"ns_id"`
@@ -310,7 +311,7 @@ func (client *RPCClient) getVolumeInfo(lvolID string) (map[string]string, error)
 		"nrIoQueues":     strconv.Itoa(result[0].NrIoQueues),
 		"ctrlLossTmo":    strconv.Itoa(result[0].CtrlLossTmo),
 		"model":          model,
-		"targetType":     "tcp",
+		"targetType":     result[0].TargetType,
 		"connections":    string(connectionsData),
 		"nsId":           strconv.Itoa(result[0].NSID),
 	}, nil

pkg/util/nvmf.go

@@ -66,6 +66,7 @@ type CreateLVolData struct {
 	LvolName     string `json:"name"`
 	Size         string `json:"size"`
 	LvsName      string `json:"pool"`
+	Fabric       string `json:"fabric"`
 	Compression  bool   `json:"comp"`
 	Encryption   bool   `json:"crypto"`
 	MaxRWIOPS    string `json:"max_rw_iops"`