From 68350e88156ba943902a9ec9b0280f5778e3ac6e Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 17 Aug 2021 11:57:01 +0530 Subject: [PATCH] cephfs: add SINGLE_NODE_{SINGLE/MULTI}_WRITER capability SINGLE_NODE_WRITER capability ambiguity has been fixed in csi spec v1.5 which allows the SP drivers to declare more granular WRITE capability. These are not really new capabilities rather capabilities introduced to get the desired functionality from CO side based on the capabilities SP driver support for various CSI operations. Signed-off-by: Humble Chirammal --- internal/cephfs/driver.go | 4 ++++ internal/cephfs/nodeserver.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/internal/cephfs/driver.go b/internal/cephfs/driver.go index 6d02fde5b..2a268b8ce 100644 --- a/internal/cephfs/driver.go +++ b/internal/cephfs/driver.go @@ -103,10 +103,14 @@ func (fs *Driver) Run(conf *util.Config) { csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT, csi.ControllerServiceCapability_RPC_EXPAND_VOLUME, csi.ControllerServiceCapability_RPC_CLONE_VOLUME, + csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER, }) fs.cd.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{ csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER, + csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER, + csi.VolumeCapability_AccessMode_SINGLE_NODE_MULTI_WRITER, + csi.VolumeCapability_AccessMode_SINGLE_NODE_SINGLE_WRITER, }) } // Create gRPC servers diff --git a/internal/cephfs/nodeserver.go b/internal/cephfs/nodeserver.go index d80093d9b..8b7c55476 100644 --- a/internal/cephfs/nodeserver.go +++ b/internal/cephfs/nodeserver.go @@ -388,6 +388,13 @@ func (ns *NodeServer) NodeGetCapabilities( }, }, }, + { + Type: &csi.NodeServiceCapability_Rpc{ + Rpc: &csi.NodeServiceCapability_RPC{ + Type: csi.NodeServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER, + }, + }, + }, }, }, nil }