mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 02:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #89 from rootfs/containerized

Browse Source 
support nsmounter when running in containerized mode
This commit is contained in:
Huamin Chen
2018-10-15 20:25:40 -04:00
committed by GitHub
parent b93418815f 3436a094f7
commit 188cdd1d68
5 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/rbd/nodeserver.go
View File

@ -35,6 +35,7 @@ import (
type nodeServer struct {
*csicommon.DefaultNodeServer
mounter mount.Interface
}
func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublishVolumeRequest) (*csi.NodePublishVolumeResponse, error) {
@ -46,7 +47,7 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
s := strings.Split(strings.TrimSuffix(targetPath, "/mount"), "/")
volName := s[len(s)-1]
notMnt, err := mount.New("").IsLikelyNotMountPoint(targetPath)
notMnt, err := ns.mounter.IsLikelyNotMountPoint(targetPath)
if err != nil {
if os.IsNotExist(err) {
if err = os.MkdirAll(targetPath, 0750); err != nil {
@ -86,7 +87,7 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
options = append(options, "ro")
}
diskMounter := &mount.SafeFormatAndMount{Interface: mount.New(""), Exec: mount.NewOsExec()}
diskMounter := &mount.SafeFormatAndMount{Interface: ns.mounter, Exec: mount.NewOsExec()}
if err := diskMounter.FormatAndMount(devicePath, targetPath, fsType, options); err != nil {
return nil, err
}
@ -96,9 +97,8 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpublishVolumeRequest) (*csi.NodeUnpublishVolumeResponse, error) {
targetPath := req.GetTargetPath()
mounter := mount.New("")
notMnt, err := mounter.IsLikelyNotMountPoint(targetPath)
notMnt, err := ns.mounter.IsLikelyNotMountPoint(targetPath)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
@ -106,13 +106,13 @@ func (ns *nodeServer) NodeUnpublishVolume(ctx context.Context, req *csi.NodeUnpu
return nil, status.Error(codes.NotFound, "Volume not mounted")
}
devicePath, cnt, err := mount.GetDeviceNameFromMount(mounter, targetPath)
devicePath, cnt, err := mount.GetDeviceNameFromMount(ns.mounter, targetPath)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}
// Unmounting the image
err = mounter.Unmount(targetPath)
err = ns.mounter.Unmount(targetPath)
if err != nil {
return nil, status.Error(codes.Internal, err.Error())
}

25
pkg/rbd/rbd.go
View File

@ -27,6 +27,10 @@ import (
"github.com/container-storage-interface/spec/lib/go/csi/v0"
"github.com/kubernetes-csi/drivers/pkg/csi-common"
"k8s.io/kubernetes/pkg/util/mount"
"k8s.io/kubernetes/pkg/util/nsenter"
"k8s.io/utils/exec"
)
// PluginFolder defines the location of rbdplugin
@ -156,13 +160,23 @@ func NewControllerServer(d *csicommon.CSIDriver) *controllerServer {
}
}
func NewNodeServer(d *csicommon.CSIDriver) *nodeServer {
func NewNodeServer(d *csicommon.CSIDriver, containerized bool) (*nodeServer, error) {
mounter := mount.New("")
if containerized {
ne, err := nsenter.NewNsenter(nsenter.DefaultHostRootFsPath, exec.New())
if err != nil {
return nil, err
}
mounter = mount.NewNsenterMounter("", ne)
}
return &nodeServer{
DefaultNodeServer: csicommon.NewDefaultNodeServer(d),
}
mounter: mounter,
}, nil
}
func (rbd *rbd) Run(driverName, nodeID, endpoint string) {
func (rbd *rbd) Run(driverName, nodeID, endpoint string, containerized bool) {
var err error
glog.Infof("Driver: %v version: %v", driverName, version)
// Initialize default library driver
@ -180,7 +194,10 @@ func (rbd *rbd) Run(driverName, nodeID, endpoint string) {
// Create GRPC servers
rbd.ids = NewIdentityServer(rbd.driver)
rbd.ns = NewNodeServer(rbd.driver)
rbd.ns, err = NewNodeServer(rbd.driver, containerized)
if err != nil {
glog.Fatalln("failed to start node server, err %v", err)
}
rbd.cs = NewControllerServer(rbd.driver)
s := csicommon.NewNonBlockingGRPCServer()
s.Start(endpoint, rbd.ids, rbd.cs, rbd.ns)