Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

csi-driver: ignore controller CREATE_DELETE_VOLUME capabilities in vm mode #2245

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

csi-driver: ignore controller CREATE_DELETE_VOLUME capabilities in vm mode #2245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions cloud/blockstore/tools/csi_driver/internal/driver/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

const diskBlockSize uint32 = 4 * 1024

var nbsServerControllerServiceCapabilities = []*csi.ControllerServiceCapability{
var podModeControllerServiceCapabilities = []*csi.ControllerServiceCapability{
{
Type: &csi.ControllerServiceCapability_Rpc{
Rpc: &csi.ControllerServiceCapability_RPC{
Expand All @@ -28,6 +28,8 @@ var nbsServerControllerServiceCapabilities = []*csi.ControllerServiceCapability{
},
}

var vmModeControllerServiceCapabilities = []*csi.ControllerServiceCapability{}

func getStorageMediaKind(parameters map[string]string) storagecoreapi.EStorageMediaKind {
kind, ok := parameters["storage-media-kind"]
if ok {
Expand Down Expand Up @@ -61,15 +63,18 @@ type nbsServerControllerService struct {

nbsClient nbsclient.ClientIface
nfsClient nfsclient.ClientIface
vmMode bool
}

func newNBSServerControllerService(
nbsClient nbsclient.ClientIface,
nfsClient nfsclient.ClientIface) csi.ControllerServer {
nfsClient nfsclient.ClientIface,
vmMode bool) csi.ControllerServer {

return &nbsServerControllerService{
nbsClient: nbsClient,
nfsClient: nfsClient,
vmMode: vmMode,
}
}

Expand All @@ -79,6 +84,12 @@ func (c *nbsServerControllerService) CreateVolume(

log.Printf("csi.CreateVolumeRequest: %+v", req)

if c.vmMode {
return nil, status.Error(
codes.Unimplemented,
"CreateVolume is not implemented in vmMode")
}

if req.Name == "" {
return nil, status.Error(
codes.InvalidArgument,
Expand Down Expand Up @@ -191,6 +202,12 @@ func (c *nbsServerControllerService) DeleteVolume(

log.Printf("csi.DeleteVolumeRequest: %+v", req)

if c.vmMode {
return nil, status.Error(
codes.Unimplemented,
"DeleteVolume is not implemented in vmMode")
}

if req.VolumeId == "" {
return nil, status.Error(
codes.InvalidArgument,
Expand Down Expand Up @@ -266,7 +283,13 @@ func (c *nbsServerControllerService) ControllerGetCapabilities(
req *csi.ControllerGetCapabilitiesRequest,
) (*csi.ControllerGetCapabilitiesResponse, error) {

if c.vmMode {
return &csi.ControllerGetCapabilitiesResponse{
Capabilities: vmModeControllerServiceCapabilities,
}, nil
}

return &csi.ControllerGetCapabilitiesResponse{
Capabilities: nbsServerControllerServiceCapabilities,
Capabilities: podModeControllerServiceCapabilities,
}, nil
}
40 changes: 39 additions & 1 deletion cloud/blockstore/tools/csi_driver/internal/driver/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"github.com/ydb-platform/nbs/cloud/blockstore/tools/csi_driver/internal/driver/mocks"
nfs "github.com/ydb-platform/nbs/cloud/filestore/public/api/protos"
storage "github.com/ydb-platform/nbs/cloud/storage/core/protos"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -24,7 +26,7 @@ func doTestCreateDeleteVolume(t *testing.T, parameters map[string]string) {
var blockSize uint32 = 4096
var blockCount uint64 = 1024

controller := newNBSServerControllerService(nbsClient, nfsClient)
controller := newNBSServerControllerService(nbsClient, nfsClient, false)

if parameters["backend"] == "nbs" {
nbsClient.On("CreateVolume", ctx, &nbs.TCreateVolumeRequest{
Expand Down Expand Up @@ -128,3 +130,39 @@ func TestGetStorageMediaKind(t *testing.T) {
)
}
}

func TestCreateDeleteVolumeNotImplementedInVmMode(t *testing.T) {
nbsClient := mocks.NewNbsClientMock()
nfsClient := mocks.NewNfsClientMock()

ctx := context.Background()
volumeID := "test-volume-id-42"
var blockSize uint32 = 4096
var blockCount uint64 = 1024
parameters := map[string]string{
"backend": "nbs",
}

controller := newNBSServerControllerService(nbsClient, nfsClient, true)
_, err := controller.CreateVolume(ctx, &csi.CreateVolumeRequest{
Name: volumeID,
Parameters: parameters,
VolumeCapabilities: []*csi.VolumeCapability{},
CapacityRange: &csi.CapacityRange{
RequiredBytes: int64(blockCount * uint64(blockSize)),
},
})

require.Error(t, err)
status, ok := status.FromError(err)
assert.True(t, ok)
assert.Equal(t, codes.Unimplemented, status.Code())

_, err = controller.DeleteVolume(ctx, &csi.DeleteVolumeRequest{
VolumeId: volumeID,
})
require.Error(t, err)
status, ok = status.FromError(err)
assert.True(t, ok)
assert.Equal(t, codes.Unimplemented, status.Code())
}
2 changes: 1 addition & 1 deletion cloud/blockstore/tools/csi_driver/internal/driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func NewDriver(cfg Config) (*Driver, error) {

csi.RegisterControllerServer(
grpcServer,
newNBSServerControllerService(nbsClient, nfsClient))
newNBSServerControllerService(nbsClient, nfsClient, cfg.VMMode))

csi.RegisterNodeServer(
grpcServer,
Expand Down
Loading