updated csi-cvmfs to 0.3.0

* added support for NodeStageVolume/NodeUnstageVolume
* refactoring

Author: gman0

pkg/cvmfs/controllerserver.go

@@ -2,7 +2,6 @@ package cvmfs
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/golang/glog"
 	"google.golang.org/grpc/codes"
@@ -16,41 +15,19 @@ type controllerServer struct {
 	*csicommon.DefaultControllerServer
 }
 
-func (cs *controllerServer) validateCreateVolumeRequest(req *csi.CreateVolumeRequest) error {
-	if err := cs.Driver.ValidateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME); err != nil {
-		return fmt.Errorf("invalid CreateVolumeRequest: %v", err)
-	}
-
-	if req.GetName() == "" {
-		return fmt.Errorf("volume name cannot be empty")
-	}
-
-	if req.GetVolumeCapabilities() == nil {
-		return fmt.Errorf("volume capabilities cannot be empty")
-	}
-
-	return nil
-}
-
-func (cs *controllerServer) validateDeleteVolumeRequest(req *csi.DeleteVolumeRequest) error {
-	if err := cs.Driver.ValidateControllerServiceRequest(csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME); err != nil {
-		return fmt.Errorf("invalid DeleteVolumeRequest: %v", err)
-	}
-
-	return nil
-}
-
 func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) {
 	if err := cs.validateCreateVolumeRequest(req); err != nil {
-		glog.Errorf("CreateVolumeRequest validation failed: %v", err)
+		glog.Errorf("failed to validate CreateVolumeRequest: %v", err)
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	volId := newVolumeIdentifier(req)
+	volId := newVolumeID()
+
+	glog.Infof("cvmfs: successfuly created volume %s", volId)
 
 	return &csi.CreateVolumeResponse{
 		Volume: &csi.Volume{
-			Id:            volId.id,
+			Id:            string(volId),
 			Attributes:    req.GetParameters(),
 			CapacityBytes: req.GetCapacityRange().GetRequiredBytes(),
 		},
@@ -59,16 +36,21 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 
 func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
 	if err := cs.validateDeleteVolumeRequest(req); err != nil {
-		glog.Errorf("DeleteVolumeRequest validation failed: %v", err)
+		glog.Errorf("failed to validate DeleteVolumeRequest: %v", err)
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
+	glog.Infof("cvmfs: successfuly deleted volume %s", req.GetVolumeId())
+
 	return &csi.DeleteVolumeResponse{}, nil
 }
 
-func (cs *controllerServer) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
+func (cs *controllerServer) ValidateVolumeCapabilities(
+	ctx context.Context,
+	req *csi.ValidateVolumeCapabilitiesRequest,
+) (*csi.ValidateVolumeCapabilitiesResponse, error) {
 	for _, c := range req.GetVolumeCapabilities() {
-		if c.AccessMode.GetMode() != csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY {
+		if c.AccessMode.GetMode() != csi.VolumeCapability_AccessMode_MULTI_NODE_READER_ONLY || c.GetBlock() != nil {
 			return &csi.ValidateVolumeCapabilitiesResponse{Supported: false}, nil
 		}
 	}

pkg/cvmfs/cvmfsconf.go

@@ -19,7 +19,7 @@ const repoConf = `
 CVMFS_HTTP_PROXY={{.Proxy}}
 {{end}}
 
-CVMFS_CACHE_BASE={{cacheBase .VolUuid}}
+CVMFS_CACHE_BASE={{cacheBase .VolumeId}}
 
 {{if .Hash}}
 CVMFS_ROOT_HASH={{.Hash}}
@@ -48,13 +48,13 @@ func init() {
 }
 
 type cvmfsConfigData struct {
-	VolUuid   string
+	VolumeId  volumeID
 	Tag, Hash string
 	Proxy     string
 }
 
 func (d *cvmfsConfigData) writeToFile() error {
-	f, err := os.OpenFile(getConfigFilePath(d.VolUuid), os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0755)
+	f, err := os.OpenFile(getConfigFilePath(d.VolumeId), os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0755)
 	if err != nil {
 		if os.IsExist(err) {
 			return nil
@@ -67,6 +67,6 @@ func (d *cvmfsConfigData) writeToFile() error {
 	return repoConfTempl.Execute(f, d)
 }
 
-func getConfigFilePath(volUuid string) string {
-	return path.Join(cvmfsConfigRoot, "config-csi-"+volUuid)
+func getConfigFilePath(volId volumeID) string {
+	return path.Join(cvmfsConfigRoot, "config-csi-"+string(volId))
 }

pkg/cvmfs/driver.go

@@ -9,7 +9,7 @@ import (
 
 const (
 	PluginFolder = "/var/lib/kubelet/plugins/csi-cvmfsplugin"
-	Version      = "0.2.0"
+	Version      = "0.3.0"
 )
 
 type cvmfsDriver struct {

pkg/cvmfs/nodeserver.go

@@ -2,7 +2,6 @@ package cvmfs
 
 import (
 	"context"
-	"errors"
 	"os"
 
 	"github.com/golang/glog"
@@ -17,68 +16,82 @@ type nodeServer struct {
 	*csicommon.DefaultNodeServer
 }
 
-func validateNodePublishVolumeRequest(req *csi.NodePublishVolumeRequest) error {
-	if req.GetVolumeCapability() == nil {
-		return errors.New("Volume capability missing in request")
+func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
+	if err := validateNodeStageVolumeRequest(req); err != nil {
+		glog.Errorf("failed to validate NodeStageVolumeRequest: %v", err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	if req.GetVolumeId() == "" {
-		return errors.New("Volume ID missing in request")
-	}
+	// Configuration
 
-	if req.GetTargetPath() == "" {
-		return errors.New("Target path missing in request")
-	}
+	stagingTargetPath := req.GetStagingTargetPath()
+	volId := volumeID(req.GetVolumeId())
 
-	return nil
-}
+	volOptions, err := newVolumeOptions(req.GetVolumeAttributes())
+	if err != nil {
+		glog.Errorf("invalid volume attributes for volume %s: %v", volId, err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
+	}
 
-func validateNodeUnpublishVolumeRequest(req *csi.NodeUnpublishVolumeRequest) error {
-	if req.GetVolumeId() == "" {
-		return errors.New("Volume ID missing in request")
+	if err = createMountPoint(stagingTargetPath); err != nil {
+		glog.Errorf("failed to create staging mount point at %s for volume %s: %v", stagingTargetPath, volId, err)
+		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	if req.GetTargetPath() == "" {
-		return errors.New("Target path missing in request")
+	confData := cvmfsConfigData{
+		VolumeId: volId,
+		Tag:      volOptions.Tag,
+		Hash:     volOptions.Hash,
+		Proxy:    volOptions.Proxy,
 	}
 
-	return nil
-}
+	if err := confData.writeToFile(); err != nil {
+		glog.Errorf("failed to write cvmfs config for volume %s: %v", volId, err)
+		return nil, status.Error(codes.Internal, err.Error())
+	}
 
-func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
-	if err := validateNodePublishVolumeRequest(req); err != nil {
-		return nil, status.Error(codes.InvalidArgument, err.Error())
+	if err := createVolumeCache(volId); err != nil {
+		glog.Errorf("failed to create cache for volume %s: %v", volId, err)
 	}
 
-	targetPath := req.GetTargetPath()
-	volId := req.GetVolumeId()
-	volUuid := uuidFromVolumeId(volId)
+	// Check if the volume is already mounted
 
-	// Configuration
+	isMnt, err := isMountPoint(stagingTargetPath)
 
-	volOptions, err := newVolumeOptions(req.GetVolumeAttributes())
 	if err != nil {
-		glog.Errorf("error reading volume options: %v", err)
-		return nil, status.Error(codes.InvalidArgument, err.Error())
+		glog.Errorf("stat failed: %v", err)
+		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	confData := cvmfsConfigData{
-		VolUuid: volUuid,
-		Tag:     volOptions.Tag,
-		Hash:    volOptions.Hash,
-		Proxy:   volOptions.Proxy,
+	if isMnt {
+		glog.Infof("cvmfs: volume %s is already mounted to %s, skipping", volId, stagingTargetPath)
+		return &csi.NodeStageVolumeResponse{}, nil
 	}
 
-	if err := confData.writeToFile(); err != nil {
-		glog.Errorf("failed to write cvmfs config for volume %s: %v", volId, err)
-		return nil, status.Errorf(codes.Internal, err.Error())
+	// It's not, mount now
+
+	if err = mountCvmfs(volOptions, volId, stagingTargetPath); err != nil {
+		glog.Errorf("failed to mount volume %s to %s: %v", volId, stagingTargetPath, err)
+		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	if err := createVolumeCache(volUuid); err != nil {
-		glog.Errorf("failed to create cache for volume %s: %v", volId, err)
+	glog.Infof("cvmfs: successfuly mounted volume %s to %s", volId, stagingTargetPath)
+
+	return &csi.NodeStageVolumeResponse{}, nil
+}
+
+func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
+	if err := validateNodePublishVolumeRequest(req); err != nil {
+		glog.Errorf("failed to validate NodePublishVolumeRequest: %v", err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	if err = createMountPoint(targetPath); err != nil {
+	// Configuration
+
+	targetPath := req.GetTargetPath()
+	volId := volumeID(req.GetVolumeId())
+
+	if err := createMountPoint(targetPath); err != nil {
 		glog.Errorf("failed to create mount point for volume %s at %s: %v", volId, targetPath, err)
 		return nil, status.Error(codes.Internal, err.Error())
 	}
@@ -93,59 +106,94 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	}
 
 	if isMnt {
-		glog.V(4).Infof("cephfs: volume %s is already mounted to %s", volId, targetPath)
+		glog.Infof("cvmfs: volume %s is already bind-mounted to %s", volId, targetPath)
 		return &csi.NodePublishVolumeResponse{}, nil
 	}
 
-	// It's not, mount now
+	// It's not, bind-mount now
 
-	if err = mountVolume(targetPath, volOptions, volUuid); err != nil {
-		glog.Errorf("failed to mount volume %s: %v", volId, err)
+	if err = bindMount(req.GetStagingTargetPath(), targetPath); err != nil {
+		glog.Errorf("failed to bind-mount volume %s to %s: %v", volId, targetPath, err)
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	glog.V(4).Infof("cvmfs: volume %s successfuly mounted to %s", volId, targetPath)
+	glog.Infof("cvmfs: successfuly bind-mounted volume %s to %s", volId, targetPath)
 
 	return &csi.NodePublishVolumeResponse{}, nil
 }
 
 func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
 	if err := validateNodeUnpublishVolumeRequest(req); err != nil {
+		glog.Errorf("failed to validate NodeUnpublishVolumeRequest: %v", err)
 		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
 	targetPath := req.GetTargetPath()
-	volId := req.GetVolumeId()
-	volUuid := uuidFromVolumeId(volId)
+	volId := volumeID(req.GetVolumeId())
 
-	if err := unmountVolume(targetPath, volUuid); err != nil {
-		glog.Errorf("failed to unmount volume %s: %v")
+	// Unbind the volume
+
+	if err := unmountVolume(targetPath); err != nil {
+		glog.Errorf("failed to unbind volume %s: %v")
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	if err := os.Remove(getVolumeRootPath(volUuid)); err != nil {
-		glog.Error("failed to remove root for volume %s: %v", volId, err)
-		return nil, status.Error(codes.Internal, err.Error())
+	// Clean up
+
+	if err := os.Remove(targetPath); err != nil {
+		glog.Errorf("cvmfs: cannot delete target path %s for volume %s: %v", targetPath, volId, err)
 	}
 
-	if err := os.Remove(getConfigFilePath(volUuid)); err != nil {
-		glog.Warningf("cannot remove config for volume %s: %v", volId, err)
+	glog.Infof("cvmfs: successfuly unbinded volume %s from %s", volId, targetPath)
+
+	return &csi.NodeUnpublishVolumeResponse{}, nil
+}
+
+func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
+	if err := validateNodeUnstageVolumeRequest(req); err != nil {
+		glog.Errorf("failed to validate NodeUnstageVolumeRequest: %v", err)
+		return nil, status.Error(codes.InvalidArgument, err.Error())
 	}
 
-	if err := purgeVolumeCache(volUuid); err != nil {
-		glog.Errorf("failed to delete cache for volume %s: %v", volId, err)
+	stagingTargetPath := req.GetStagingTargetPath()
+	volId := volumeID(req.GetVolumeId())
+
+	// Unmount the volume
+
+	if err := unmountVolume(stagingTargetPath); err != nil {
+		glog.Errorf("failed unmount volume %s: %v", volId, err)
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	glog.V(4).Infof("cvmfs: volume %s successfuly unmounted from %s", req.GetVolumeId(), targetPath)
+	// Clean up
 
-	return &csi.NodeUnpublishVolumeResponse{}, nil
-}
+	if err := os.Remove(getConfigFilePath(volId)); err != nil {
+		glog.Errorf("cvmfs: cannot remove config for volume %s: %v", volId, err)
+	}
 
-func (ns *nodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRequest) (*csi.NodeStageVolumeResponse, error) {
-	return nil, status.Error(codes.Unimplemented, "")
+	if err := purgeVolumeCache(volId); err != nil {
+		glog.Errorf("cvmfs: cannot delete cache for volume %s: %v", volId, err)
+	}
+
+	if err := os.Remove(stagingTargetPath); err != nil {
+		glog.Errorf("cvmfs: cannot delete staging target path %s for volume %s: %v", stagingTargetPath, volId, err)
+	}
+
+	glog.Infof("cvmfs: successfuly unmounted volume %s from %s", volId, stagingTargetPath)
+
+	return &csi.NodeUnstageVolumeResponse{}, nil
 }
 
-func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstageVolumeRequest) (*csi.NodeUnstageVolumeResponse, error) {
-	return nil, status.Error(codes.Unimplemented, "")
+func (ns *nodeServer) NodeGetCapabilities(ctx context.Context, req *csi.NodeGetCapabilitiesRequest) (*csi.NodeGetCapabilitiesResponse, error) {
+	return &csi.NodeGetCapabilitiesResponse{
+		Capabilities: []*csi.NodeServiceCapability{
+			{
+				Type: &csi.NodeServiceCapability_Rpc{
+					Rpc: &csi.NodeServiceCapability_RPC{
+						Type: csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME,
+					},
+				},
+			},
+		},
+	}, nil
 }