Skip to content

Commit

Permalink
Nfs controller publish Changes (#190)
Browse files Browse the repository at this point in the history 
* indentation fixed for controller.yaml

* NFS storage class yaml updated

* create NFS volume implemented

* go.mod and go.sum updated

* update controller publish volume for nfs.

* hardcoded volume name for testing.

* add debug.

* files updated

* add debug.

* removed debug statements

* add debug.

* fixed error.

* fix the panic.

* add debug.

* fixed the nil panic.

* fixed the nfs export.

* fix nfs export error.

* files updated

* updated files.

* files updated

* removed debug logs.

* remove debug logs.

* add debug.

* add debug.

* add debug3.

* fixed a mistake.

* add debug.

* fixed th idempotency.

* remove debug logs.

* removed the hardcoded name.

* address review comments.

---------

Co-authored-by: Khare <rajshree.khare@dell.com>
  • Loading branch information
@VamsiSiddu-7 @khareRajshree
VamsiSiddu-7 and khareRajshree authored May 12, 2023
1 parent 4be7c48 commit 2492d61
Show file tree
Hide file tree
Showing 2 changed files with 174 additions and 15 deletions.
27 changes: 25 additions & 2 deletions service/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ const (
// volume create parameters map
KeyFsType = "fsType"

NFSExportLocalPath = "/"
NFSExportNamePrefix = "csishare-"

// DefaultVolumeSizeKiB is default volume sgolang/protobuf/blob/master/ptypesize
// to create on a scaleIO cluster when no size is given, expressed in KiB
DefaultVolumeSizeKiB = 16 * kiBytesInGiB
Expand Down Expand Up @@ -253,6 +256,7 @@ func (s *service) CreateVolume(
var arr *ArrayConnectionData
sysID := s.opts.defaultSystemID
arr = s.opts.arrays[sysID]
volName := name

if isNFS {
// fetch NAS server ID
Expand All @@ -275,6 +279,7 @@ func (s *service) CreateVolume(
if err != nil {
return nil, err
}

}

storagePoolName, ok := params[KeyStoragePool]
Expand Down Expand Up @@ -326,7 +331,11 @@ func (s *service) CreateVolume(
if existingFS != nil {
if existingFS.SizeTotal == int(size) {
vi := s.getCSIVolumeFromFilesystem(existingFS, systemID)
vi.AccessibleTopology = volumeTopology
vi.VolumeContext[KeyNasName] = nasName
vi.VolumeContext[KeyNfsACL] = nfsAcls
vi.VolumeContext[KeyFsType] = fsType
nfsTopology := s.GetNfsTopology(systemID)
vi.AccessibleTopology = nfsTopology
csiResp := &csi.CreateVolumeResponse{
Volume: vi,
}
Expand Down Expand Up @@ -825,7 +834,14 @@ func (s *service) ControllerPublishVolume(
}
}

// create publish context
publishContext := make(map[string]string)
publishContext[KeyNasName] = volumeContext[KeyNasName]
publishContext[KeyNfsACL] = volumeContext[KeyNfsACL]

csiVolID := req.GetVolumeId()
publishContext["volumeContextId"] = csiVolID

if csiVolID == "" {
return nil, status.Error(codes.InvalidArgument,
"volume ID is required")
Expand Down Expand Up @@ -882,6 +898,13 @@ func (s *service) ControllerPublishVolume(
err.Error())
}

sdcIP, err := s.getSDCIP(nodeID, systemID)
if err != nil {
return nil, status.Errorf(codes.NotFound, err.Error())
}

publishContext["host"] = sdcIP

fsc := req.GetVolumeCapability()
if fsc == nil {
return nil, status.Error(codes.InvalidArgument,
Expand All @@ -898,7 +921,7 @@ func (s *service) ControllerPublishVolume(
errUnknownAccessMode)
}
//Export for NFS
resp, err := s.exportFilesystem(ctx, req, adminClient, fs, nodeID)
resp, err := s.exportFilesystem(ctx, req, adminClient, fs, sdcIP, nodeID, publishContext, am)
return resp, err
} else {
volID := getVolumeIDFromCsiVolumeID(csiVolID)
Expand Down
162 changes: 149 additions & 13 deletions service/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ import (
"sigs.k8s.io/yaml"

"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down Expand Up @@ -464,6 +467,7 @@ func (s *service) checkNFS(ctx context.Context, systemID string) (bool, error) {
if err != nil {
return false, err
}

c := s.adminClients[systemID]
if c == nil {
return false, nil
Expand Down Expand Up @@ -602,6 +606,23 @@ func (s *service) getSDCID(sdcGUID string, systemID string) (string, error) {
return id.Sdc.ID, nil
}

// getSDCID returns SDC ID from the given sdc GUID and system ID.
func (s *service) getSDCIP(sdcGUID string, systemID string) (string, error) {
sdcGUID = strings.ToUpper(sdcGUID)

// Need to translate sdcGUID to fmt.Errorf("getSDCIP error systemID not found: %s", systemID)
if s.systems[systemID] == nil {
return "", fmt.Errorf("getSDCIP error systemID not found: %s", systemID)
}
id, err := s.systems[systemID].FindSdc("SdcGUID", sdcGUID)
if err != nil {
return "", fmt.Errorf("error finding SDC from GUID: %s, err: %s",
sdcGUID, err.Error())
}

return id.Sdc.SdcIP, nil
}

// getStoragePoolID returns pool ID from the given name, system ID, and protectionDomain name
func (s *service) getStoragePoolID(name, systemID, pdID string) (string, error) {

Expand Down Expand Up @@ -906,22 +927,137 @@ func (s *service) getSystemIDFromCsiVolumeID(csiVolID string) string {
}

// exportFilesystem - Method to export filesystem with idempotency
func (s *service) exportFilesystem(ctx context.Context, req *csi.ControllerPublishVolumeRequest, client *goscaleio.Client, fs *siotypes.FileSystem, nodeID string) (*csi.ControllerPublishVolumeResponse, error) {
volumeContext := req.GetVolumeContext()
func (s *service) exportFilesystem(ctx context.Context, req *csi.ControllerPublishVolumeRequest, client *goscaleio.Client, fs *siotypes.FileSystem, nodeIP, nodeID string, pContext map[string]string, am *csi.VolumeCapability_AccessMode) (*csi.ControllerPublishVolumeResponse, error) {

var nfsExportName string
nfsExportName = NFSExportNamePrefix + fs.Name

// fetch the node IP, for exporting the FS on host.
// TODO
nfsExportExists := false
var nfsExportID string

// Check if nfs export exists for the File system
nfsExportList, err := client.GetNFSExport()

if err != nil {
return nil, err
}

for _, nfsExport := range nfsExportList {
if nfsExport.FileSystemID == fs.ID {
nfsExportExists = true
nfsExportID = nfsExport.ID
nfsExportName = nfsExport.Name
}
}

// Create NFS export if it doesn't exist
// Add host IP to existing nfs export
// Add external host IP to existing nfs export
// TODO

// create publish context
publishContext := make(map[string]string)
publishContext[KeyNasName] = volumeContext[KeyNasName]
publishContext[KeyNfsACL] = volumeContext[KeyNfsACL]
return &csi.ControllerPublishVolumeResponse{PublishContext: publishContext}, nil
if !nfsExportExists {
Log.Debugf("NFS Export does not exist for fs: %s ,proceeding to create NFS Export", fs)
resp, err := client.CreateNFSExport(&siotypes.NFSExportCreate{
Name: nfsExportName,
FileSystemID: fs.ID,
Path: NFSExportLocalPath + fs.Name,
})

if err != nil {
return nil, status.Errorf(codes.NotFound, "create NFS Export failed. Error:%v", err)
}

nfsExportID = resp.ID
}

nfsExportResp, err := client.GetNFSExportByIDName(nfsExportID, "")

if err != nil {
return nil, status.Errorf(codes.NotFound, "Could not find NFS Export: %s", err)
}

readOnlyHosts := nfsExportResp.ReadOnlyHosts
readWriteHosts := nfsExportResp.ReadWriteHosts
readOnlyRootHosts := nfsExportResp.ReadOnlyRootHosts
readWriteRootHosts := nfsExportResp.ReadWriteRootHosts

foundIncompatible := false
foundIdempotent := false
otherHostsWithAccess := len(readOnlyHosts)

var readHostList, readWriteHostList []string

for _, host := range readOnlyHosts {
if host == nodeIP {
foundIncompatible = true
break
}
}

otherHostsWithAccess += len(readWriteHosts)
if !foundIncompatible {
for _, host := range readWriteHosts {
if host == nodeIP {
foundIncompatible = true
break
}
}
}

otherHostsWithAccess += len(readOnlyRootHosts)
if !foundIncompatible {
for _, host := range readOnlyRootHosts {
readHostList = append(readHostList, host)
if host == nodeIP {
if am.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY {
foundIdempotent = true
} else {
foundIncompatible = true
}
}
}
}
otherHostsWithAccess += len(readWriteRootHosts)

if !foundIncompatible && !foundIdempotent {
for _, host := range readWriteRootHosts {
readWriteHostList = append(readWriteHostList, nodeIP)
if host == nodeIP {
if am.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY {
foundIncompatible = true
} else {
foundIdempotent = true
otherHostsWithAccess--
}
}
}
}

if foundIncompatible {
return nil, status.Errorf(codes.NotFound, "Host: %s has access on NFS Export: %s with incompatible access mode.", nodeID, nfsExportID)
}

if (am.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER || am.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER || am.Mode == csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER) && otherHostsWithAccess > 0 {
return nil, status.Errorf(codes.NotFound, "Other hosts have access on NFS Share: %s", nfsExportID)
}

//Idempotent case
if foundIdempotent {
Log.Info("Host has access to the given host and exists in the required state.")
return &csi.ControllerPublishVolumeResponse{PublishContext: pContext}, nil
}
//Allocate host access to NFS Share with appropriate access mode
if am.Mode == csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY {
readHostList = append(readHostList, nodeIP)
client.ModifyNFSExport(&siotypes.NFSExportModify{AddReadOnlyRootHosts: readHostList}, nfsExportID)
} else {
readWriteHostList = append(readWriteHostList, nodeIP)
client.ModifyNFSExport(&siotypes.NFSExportModify{AddReadWriteRootHosts: readWriteHostList}, nfsExportID)
}

if err != nil {
return nil, status.Errorf(codes.NotFound, "Allocating host %s access to NFS Export failed. Error: %v", nodeID, err)
}
Log.Debugf("NFS Export: %s is accessible to host: %s with access mode: %s", nfsExportID, nodeID, am.Mode)
Log.Debugf("ControllerPublishVolume successful for volid: [%s]", pContext["volumeContextId"])

return &csi.ControllerPublishVolumeResponse{PublishContext: pContext}, nil
}

// this function updates volumePrefixToSystems, a map of volume ID prefixes -> system IDs
Expand Down

0 comments on commit 2492d61

Please sign in to comment.