github/zfssa-csi-driver
1
0
Fork 0
mirror of https://github.com/oracle/zfssa-csi-driver.git synced 2025-06-28 06:26:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing parameters to CreateFilesystem req so that the created FS can be mounted later

Browse Source
This commit is contained in:
Helen Zhang 2024-01-05 17:08:03 -08:00
parent 817778f1c6
commit b7e0b32f24
1 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/service/controller_fs.go
View File

@ -6,10 +6,10 @@
package service package service
import ( import (
"github.com/oracle/zfssa-csi-driver/pkg/utils"
"github.com/oracle/zfssa-csi-driver/pkg/zfssarest"
"context" "context"
"github.com/container-storage-interface/spec/lib/go/csi" "github.com/container-storage-interface/spec/lib/go/csi"
"github.com/oracle/zfssa-csi-driver/pkg/utils"
"github.com/oracle/zfssa-csi-driver/pkg/zfssarest"
context2 "golang.org/x/net/context" context2 "golang.org/x/net/context"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
@ -19,11 +19,11 @@ import (
var ( var (
filesystemAccessModes = []csi.VolumeCapability_AccessMode{ filesystemAccessModes = []csi.VolumeCapability_AccessMode{
{ Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER }, {Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER},
{ Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER }, {Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER},
{ Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY }, {Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY},
{ Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY }, {Mode: csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY},
{ Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY }, {Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_READER_ONLY},
} }
) )
@ -58,6 +58,16 @@ func (fs *zFilesystem) create(ctx context.Context, token *zfssarest.Token,
capacityRange := req.GetCapacityRange() capacityRange := req.GetCapacityRange()
capabilities := req.GetVolumeCapabilities() capabilities := req.GetVolumeCapabilities()
if _, ok := req.Parameters["restrictChown"]; !ok {
utils.GetLogCTRL(ctx, 5).Println("Adding restrictChown to CreateFilesystem req parameters")
req.Parameters["restrictChown"] = "false"
}
if _, ok := req.Parameters["shareNFS"]; !ok {
utils.GetLogCTRL(ctx, 5).Println("Adding shareNFS to CreateFilesystem req parameters")
req.Parameters["shareNFS"] = "on"
}
fsinfo, httpStatus, err := zfssarest.CreateFilesystem(ctx, token, fsinfo, httpStatus, err := zfssarest.CreateFilesystem(ctx, token,
req.GetName(), getVolumeSize(capacityRange), &req.Parameters) req.GetName(), getVolumeSize(capacityRange), &req.Parameters)
if err != nil { if err != nil {
@ -168,7 +178,6 @@ func (lun *zFilesystem) clone(ctx context.Context, token *zfssarest.Token,
} }
// Publishes a file system. In this case there's nothing to do. // Publishes a file system. In this case there's nothing to do.
//
func (fs *zFilesystem) controllerPublishVolume(ctx context.Context, token *zfssarest.Token, func (fs *zFilesystem) controllerPublishVolume(ctx context.Context, token *zfssarest.Token,
req *csi.ControllerPublishVolumeRequest, nodeName string) (*csi.ControllerPublishVolumeResponse, error) { req *csi.ControllerPublishVolumeRequest, nodeName string) (*csi.ControllerPublishVolumeResponse, error) {
@ -178,9 +187,7 @@ func (fs *zFilesystem) controllerPublishVolume(ctx context.Context, token *zfssa
return &csi.ControllerPublishVolumeResponse{}, nil return &csi.ControllerPublishVolumeResponse{}, nil
} }
// Unpublishes a file system. In this case there's nothing to do. // Unpublishes a file system. In this case there's nothing to do.
//
func (fs *zFilesystem) controllerUnpublishVolume(ctx context.Context, token *zfssarest.Token, func (fs *zFilesystem) controllerUnpublishVolume(ctx context.Context, token *zfssarest.Token,
req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) { req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) {
utils.GetLogCTRL(ctx, 5).Println("fs.controllerUnpublishVolume") utils.GetLogCTRL(ctx, 5).Println("fs.controllerUnpublishVolume")
@ -316,7 +323,7 @@ func (fs *zFilesystem) lock(ctx context.Context) volumeState {
return fs.state return fs.state
} }
func (fs *zFilesystem) unlock(ctx context.Context) (int32, volumeState){ func (fs *zFilesystem) unlock(ctx context.Context) (int32, volumeState) {
fs.bolt.Unlock(ctx) fs.bolt.Unlock(ctx)
utils.GetLogCTRL(ctx, 5).Printf("%s is unlocked", fs.id.String()) utils.GetLogCTRL(ctx, 5).Printf("%s is unlocked", fs.id.String())
return fs.refcount, fs.state return fs.refcount, fs.state