From fc5eadf106a4275fe0abd21b53f57a4e5a077758 Mon Sep 17 00:00:00 2001 From: Mehdy Khoshnoody Date: Mon, 1 Jun 2020 18:27:51 +0430 Subject: [PATCH] rbd: Add rados namespace support for rbd Make sure to operate within the namespace if any given when dealing with rbd images and snapshots and their journals. Signed-off-by: Mehdy Khoshnoody --- internal/cephfs/fsjournal.go | 18 ++++++--- internal/cephfs/volumeoptions.go | 6 ++- internal/journal/voljournal.go | 3 +- internal/rbd/clone.go | 2 +- internal/rbd/controllerserver.go | 11 +++++- internal/rbd/errors.go | 2 +- internal/rbd/nodeserver.go | 4 +- internal/rbd/rbd_attach.go | 46 +++++++++++++--------- internal/rbd/rbd_journal.go | 12 +++--- internal/rbd/rbd_util.go | 66 +++++++++++++++++++++++--------- internal/rbd/snapshot.go | 1 + internal/util/csiconfig.go | 12 ++++++ 12 files changed, 125 insertions(+), 58 deletions(-) diff --git a/internal/cephfs/fsjournal.go b/internal/cephfs/fsjournal.go index 7ebe8509c..210a9bda2 100644 --- a/internal/cephfs/fsjournal.go +++ b/internal/cephfs/fsjournal.go @@ -65,7 +65,8 @@ func checkVolExists(ctx context.Context, sID *snapshotIdentifier, cr *util.Credentials) (*volumeIdentifier, error) { var vid volumeIdentifier - j, err := volJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := volJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return nil, err } @@ -174,7 +175,8 @@ func undoVolReservation(ctx context.Context, volOptions *volumeOptions, vid volu } defer cr.DeleteCredentials() - j, err := volJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := volJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return err } @@ -220,7 +222,8 @@ func reserveVol(ctx context.Context, volOptions *volumeOptions, secret map[strin return nil, err } - j, err := volJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := volJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return nil, err } @@ -256,7 +259,8 @@ func reserveSnap(ctx context.Context, volOptions *volumeOptions, parentSubVolNam err error ) - j, err := snapJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := snapJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return nil, err } @@ -285,7 +289,8 @@ func reserveSnap(ctx context.Context, volOptions *volumeOptions, parentSubVolNam // undoSnapReservation is a helper routine to undo a name reservation for a CSI SnapshotName. func undoSnapReservation(ctx context.Context, volOptions *volumeOptions, vid snapshotIdentifier, snapName string, cr *util.Credentials) error { - j, err := snapJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := snapJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return err } @@ -316,7 +321,8 @@ func checkSnapExists( parentSubVolName string, snap *cephfsSnapshot, cr *util.Credentials) (*snapshotIdentifier, *snapshotInfo, error) { - j, err := snapJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := snapJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return nil, nil, err } diff --git a/internal/cephfs/volumeoptions.go b/internal/cephfs/volumeoptions.go index 6bf63856b..51c186cb8 100644 --- a/internal/cephfs/volumeoptions.go +++ b/internal/cephfs/volumeoptions.go @@ -261,7 +261,8 @@ func newVolumeOptionsFromVolID(ctx context.Context, volID string, volOpt, secret return nil, nil, err } - j, err := volJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := volJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return nil, nil, err } @@ -448,7 +449,8 @@ func newSnapshotOptionsFromID(ctx context.Context, snapID string, cr *util.Crede return &volOptions, nil, &sid, err } - j, err := snapJournal.Connect(volOptions.Monitors, cr) + // Connect to cephfs' default radosNamespace (csi) + j, err := snapJournal.Connect(volOptions.Monitors, radosNamespace, cr) if err != nil { return &volOptions, nil, &sid, err } diff --git a/internal/journal/voljournal.go b/internal/journal/voljournal.go index bc09c913f..ac1067ae3 100644 --- a/internal/journal/voljournal.go +++ b/internal/journal/voljournal.go @@ -235,7 +235,8 @@ type Connection struct { } // Connect establishes a new connection to a ceph cluster for journal metadata. -func (cj *Config) Connect(monitors string, cr *util.Credentials) (*Connection, error) { +func (cj *Config) Connect(monitors, namespace string, cr *util.Credentials) (*Connection, error) { + cj.namespace = namespace cc := &util.ClusterConnection{} if err := cc.Connect(monitors, cr); err != nil { return nil, err diff --git a/internal/rbd/clone.go b/internal/rbd/clone.go index 26aaab2bc..c2d141848 100644 --- a/internal/rbd/clone.go +++ b/internal/rbd/clone.go @@ -164,7 +164,7 @@ func (rv *rbdVolume) createCloneFromImage(ctx context.Context, parentVol *rbdVol ) var j = &journal.Connection{} - j, err = volJournal.Connect(rv.Monitors, rv.conn.Creds) + j, err = volJournal.Connect(rv.Monitors, rv.RadosNamespace, rv.conn.Creds) if err != nil { return status.Error(codes.Internal, err.Error()) } diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index bf051b266..d9945184b 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -75,6 +75,9 @@ func (cs *ControllerServer) validateVolumeReq(ctx context.Context, req *csi.Crea if value, ok := options["dataPool"]; ok && value == "" { return status.Error(codes.InvalidArgument, "empty datapool name to provision volume from") } + if value, ok := options["raodsNamespace"]; ok && value == "" { + return status.Error(codes.InvalidArgument, "empty namespace name to provision volume from") + } if value, ok := options["volumeNamePrefix"]; ok && value == "" { return status.Error(codes.InvalidArgument, "empty volume name prefix to provision volume from") } @@ -146,6 +149,9 @@ func buildCreateVolumeResponse(ctx context.Context, req *csi.CreateVolumeRequest volumeContext["pool"] = rbdVol.Pool volumeContext["journalPool"] = rbdVol.JournalPool volumeContext["imageName"] = rbdVol.RbdImageName + if rbdVol.RadosNamespace != "" { + volumeContext["radosNamespace"] = rbdVol.RadosNamespace + } volume := &csi.Volume{ VolumeId: rbdVol.VolID, CapacityBytes: rbdVol.VolSize, @@ -291,6 +297,7 @@ func (cs *ControllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol volumeContext := req.GetParameters() volumeContext["pool"] = rbdVol.Pool volumeContext["journalPool"] = rbdVol.JournalPool + volumeContext["radosNamespace"] = rbdVol.RadosNamespace volumeContext["imageName"] = rbdVol.RbdImageName volume := &csi.Volume{ VolumeId: rbdVol.VolID, @@ -409,7 +416,7 @@ func (cs *ControllerServer) createBackingImage(ctx context.Context, cr *util.Cre var err error var j = &journal.Connection{} - j, err = volJournal.Connect(rbdVol.Monitors, cr) + j, err = volJournal.Connect(rbdVol.Monitors, rbdVol.RadosNamespace, cr) if err != nil { return status.Error(codes.Internal, err.Error()) } @@ -906,7 +913,7 @@ func (cs *ControllerServer) doSnapshotClone(ctx context.Context, parentVol *rbdV } var j = &journal.Connection{} // save image ID - j, err = snapJournal.Connect(rbdSnap.Monitors, cr) + j, err = snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr) if err != nil { klog.Errorf(util.Log(ctx, "failed to connect to cluster: %v"), err) return ready, cloneRbd, err diff --git a/internal/rbd/errors.go b/internal/rbd/errors.go index 4b84f1328..1c865aac6 100644 --- a/internal/rbd/errors.go +++ b/internal/rbd/errors.go @@ -19,7 +19,7 @@ package rbd import "errors" var ( - // ErrImageNotFound is returned when image name is not found in the cluster on the given pool. + // ErrImageNotFound is returned when image name is not found in the cluster on the given pool and/or namespace. ErrImageNotFound = errors.New("image not found") // ErrSnapNotFound is returned when snap name passed is not found in the list of snapshots for the // given image. diff --git a/internal/rbd/nodeserver.go b/internal/rbd/nodeserver.go index 78c50e81d..f4422335a 100644 --- a/internal/rbd/nodeserver.go +++ b/internal/rbd/nodeserver.go @@ -187,7 +187,7 @@ func (ns *NodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStageVol return nil, status.Error(codes.Internal, err.Error()) } - j, err2 := volJournal.Connect(volOptions.Monitors, cr) + j, err2 := volJournal.Connect(volOptions.Monitors, volOptions.RadosNamespace, cr) if err2 != nil { klog.Errorf( util.Log(ctx, "failed to establish cluster connection: %v"), @@ -751,7 +751,7 @@ func getDevicePath(ctx context.Context, volumePath string) (string, error) { if err != nil { klog.Errorf(util.Log(ctx, "failed to find image metadata: %v"), err) } - device, found := findDeviceMappingImage(ctx, imgInfo.Pool, imgInfo.ImageName, imgInfo.NbdAccess) + device, found := findDeviceMappingImage(ctx, imgInfo.Pool, imgInfo.RadosNamespace, imgInfo.ImageName, imgInfo.NbdAccess) if found { return device, nil } diff --git a/internal/rbd/rbd_attach.go b/internal/rbd/rbd_attach.go index ca20258e4..514bccc7a 100644 --- a/internal/rbd/rbd_attach.go +++ b/internal/rbd/rbd_attach.go @@ -58,10 +58,11 @@ func init() { // rbdDeviceInfo strongly typed JSON spec for rbd device list output (of type krbd). type rbdDeviceInfo struct { - ID string `json:"id"` - Pool string `json:"pool"` - Name string `json:"name"` - Device string `json:"device"` + ID string `json:"id"` + Pool string `json:"pool"` + RadosNamespace string `json:"radosNamespace"` + Name string `json:"name"` + Device string `json:"device"` } // nbdDeviceInfo strongly typed JSON spec for rbd-nbd device list output (of type nbd) @@ -69,10 +70,11 @@ type rbdDeviceInfo struct { // requiring 2 different JSON structures to unmarshal the output. // NOTE: image key is "name" in krbd output and "image" in nbd output, which is another difference. type nbdDeviceInfo struct { - ID int64 `json:"id"` - Pool string `json:"pool"` - Name string `json:"image"` - Device string `json:"device"` + ID int64 `json:"id"` + Pool string `json:"pool"` + RadosNamespace string `json:"radosNamespace"` + Name string `json:"image"` + Device string `json:"device"` } // rbdGetDeviceList queries rbd about mapped devices and returns a list of rbdDeviceInfo @@ -104,10 +106,11 @@ func rbdGetDeviceList(ctx context.Context, accessType string) ([]rbdDeviceInfo, rbdDeviceList = append( rbdDeviceList, rbdDeviceInfo{ - ID: strconv.FormatInt(device.ID, 10), - Pool: device.Pool, - Name: device.Name, - Device: device.Device, + ID: strconv.FormatInt(device.ID, 10), + Pool: device.Pool, + RadosNamespace: device.RadosNamespace, + Name: device.Name, + Device: device.Device, }) } } @@ -115,21 +118,26 @@ func rbdGetDeviceList(ctx context.Context, accessType string) ([]rbdDeviceInfo, return rbdDeviceList, nil } -// findDeviceMappingImage finds a devicePath, if available, based on image spec (pool/image) on the node. -func findDeviceMappingImage(ctx context.Context, pool, image string, useNbdDriver bool) (string, bool) { +// findDeviceMappingImage finds a devicePath, if available, based on image spec (pool/{namespace/}image) on the node. +func findDeviceMappingImage(ctx context.Context, pool, namespace, image string, useNbdDriver bool) (string, bool) { accessType := accessTypeKRbd if useNbdDriver { accessType = accessTypeNbd } + imageSpec := fmt.Sprintf("%s/%s", pool, image) + if namespace != "" { + imageSpec = fmt.Sprintf("%s/%s/%s", pool, namespace, image) + } + rbdDeviceList, err := rbdGetDeviceList(ctx, accessType) if err != nil { - klog.Warningf(util.Log(ctx, "failed to determine if image (%s/%s) is mapped to a device (%v)"), pool, image, err) + klog.Warningf(util.Log(ctx, "failed to determine if image (%s) is mapped to a device (%v)"), imageSpec, err) return "", false } for _, device := range rbdDeviceList { - if device.Name == image && device.Pool == pool { + if device.Name == image && device.Pool == pool && device.RadosNamespace == namespace { return device.Device, true } } @@ -138,13 +146,13 @@ func findDeviceMappingImage(ctx context.Context, pool, image string, useNbdDrive } // Stat a path, if it doesn't exist, retry maxRetries times. -func waitForPath(ctx context.Context, pool, image string, maxRetries int, useNbdDriver bool) (string, bool) { +func waitForPath(ctx context.Context, pool, namespace, image string, maxRetries int, useNbdDriver bool) (string, bool) { for i := 0; i < maxRetries; i++ { if i != 0 { time.Sleep(time.Second) } - device, found := findDeviceMappingImage(ctx, pool, image, useNbdDriver) + device, found := findDeviceMappingImage(ctx, pool, namespace, image, useNbdDriver) if found { return device, found } @@ -182,7 +190,7 @@ func attachRBDImage(ctx context.Context, volOptions *rbdVolume, cr *util.Credent useNBD = true } - devicePath, found := waitForPath(ctx, volOptions.Pool, image, 1, useNBD) + devicePath, found := waitForPath(ctx, volOptions.Pool, volOptions.RadosNamespace, image, 1, useNBD) if !found { backoff := wait.Backoff{ Duration: rbdImageWatcherInitDelay, diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go index fdd475d27..05940f4e6 100644 --- a/internal/rbd/rbd_journal.go +++ b/internal/rbd/rbd_journal.go @@ -117,7 +117,7 @@ func checkSnapCloneExists(ctx context.Context, parentVol *rbdVolume, rbdSnap *rb return false, err } - j, err := snapJournal.Connect(rbdSnap.Monitors, cr) + j, err := snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr) if err != nil { return false, err } @@ -242,7 +242,7 @@ func (rv *rbdVolume) Exists(ctx context.Context, parentVol *rbdVolume) (bool, er kmsID = rv.KMS.GetID() } - j, err := volJournal.Connect(rv.Monitors, rv.conn.Creds) + j, err := volJournal.Connect(rv.Monitors, rv.RadosNamespace, rv.conn.Creds) if err != nil { return false, err } @@ -345,7 +345,7 @@ func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, c return err } - j, err := snapJournal.Connect(rbdSnap.Monitors, cr) + j, err := snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr) if err != nil { return err } @@ -423,7 +423,7 @@ func reserveVol(ctx context.Context, rbdVol *rbdVolume, rbdSnap *rbdSnapshot, cr kmsID = rbdVol.KMS.GetID() } - j, err := volJournal.Connect(rbdVol.Monitors, cr) + j, err := volJournal.Connect(rbdVol.Monitors, rbdVol.RadosNamespace, cr) if err != nil { return err } @@ -450,7 +450,7 @@ func reserveVol(ctx context.Context, rbdVol *rbdVolume, rbdSnap *rbdSnapshot, cr // undoSnapReservation is a helper routine to undo a name reservation for rbdSnapshot. func undoSnapReservation(ctx context.Context, rbdSnap *rbdSnapshot, cr *util.Credentials) error { - j, err := snapJournal.Connect(rbdSnap.Monitors, cr) + j, err := snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr) if err != nil { return err } @@ -465,7 +465,7 @@ func undoSnapReservation(ctx context.Context, rbdSnap *rbdSnapshot, cr *util.Cre // undoVolReservation is a helper routine to undo a name reservation for rbdVolume. func undoVolReservation(ctx context.Context, rbdVol *rbdVolume, cr *util.Credentials) error { - j, err := volJournal.Connect(rbdVol.Monitors, cr) + j, err := volJournal.Connect(rbdVol.Monitors, rbdVol.RadosNamespace, cr) if err != nil { return err } diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index 268cfd1f8..32b494ba9 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -86,6 +86,7 @@ type rbdVolume struct { JournalPool string Pool string `json:"pool"` DataPool string + RadosNamespace string ImageID string ParentName string imageFeatureSet librbd.FeatureSet @@ -129,6 +130,7 @@ type rbdSnapshot struct { Monitors string JournalPool string Pool string + RadosNamespace string CreatedAt *timestamp.Timestamp SizeBytes int64 ClusterID string @@ -165,13 +167,19 @@ func (rv *rbdVolume) Destroy() { } } -// String returns the image-spec (pool/image) format of the image. +// String returns the image-spec (pool/{namespace/}image) format of the image. func (rv *rbdVolume) String() string { + if rv.RadosNamespace != "" { + return fmt.Sprintf("%s/%s/%s", rv.Pool, rv.RadosNamespace, rv.RbdImageName) + } return fmt.Sprintf("%s/%s", rv.Pool, rv.RbdImageName) } -// String returns the snap-spec (pool/image@snap) format of the snapshot. +// String returns the snap-spec (pool/{namespace/}image@snap) format of the snapshot. func (rs *rbdSnapshot) String() string { + if rs.RadosNamespace != "" { + return fmt.Sprintf("%s/%s/%s@%s", rs.Pool, rs.RadosNamespace, rs.RbdImageName, rs.RbdSnapName) + } return fmt.Sprintf("%s/%s@%s", rs.Pool, rs.RbdImageName, rs.RbdSnapName) } @@ -228,6 +236,7 @@ func (rv *rbdVolume) openIoctx() error { return err } + ioctx.SetNamespace(rv.RadosNamespace) rv.ioctx = ioctx return nil @@ -484,10 +493,11 @@ func (rv *rbdVolume) hasFeature(feature uint64) bool { func (rv *rbdVolume) checkImageChainHasFeature(ctx context.Context, feature uint64) (bool, error) { vol := rbdVolume{ - Pool: rv.Pool, - Monitors: rv.Monitors, - RbdImageName: rv.RbdImageName, - conn: rv.conn, + Pool: rv.Pool, + RadosNamespace: rv.RadosNamespace, + Monitors: rv.Monitors, + RbdImageName: rv.RbdImageName, + conn: rv.conn, } err := vol.openIoctx() if err != nil { @@ -543,7 +553,12 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str } rbdSnap.JournalPool = rbdSnap.Pool - j, err := snapJournal.Connect(rbdSnap.Monitors, cr) + rbdSnap.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdSnap.ClusterID) + if err != nil { + return err + } + + j, err := snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr) if err != nil { return err } @@ -611,7 +626,12 @@ func genVolFromVolID(ctx context.Context, volumeID string, cr *util.Credentials, } rbdVol.JournalPool = rbdVol.Pool - j, err := volJournal.Connect(rbdVol.Monitors, cr) + rbdVol.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdVol.ClusterID) + if err != nil { + return nil, err + } + + j, err := volJournal.Connect(rbdVol.Monitors, rbdVol.RadosNamespace, cr) if err != nil { return rbdVol, err } @@ -690,6 +710,10 @@ func genVolFromVolumeOptions(ctx context.Context, volOptions, credentials map[st return nil, err } + rbdVol.RadosNamespace, err = util.RadosNamespace(csiConfigFile, rbdVol.ClusterID) + if err != nil { + return nil, err + } // if no image features is provided, it results in empty string // which disable all RBD image features as we expected @@ -742,6 +766,7 @@ func genSnapFromOptions(ctx context.Context, rbdVol *rbdVolume, snapOptions map[ rbdSnap := &rbdSnapshot{} rbdSnap.Pool = rbdVol.Pool rbdSnap.JournalPool = rbdVol.JournalPool + rbdSnap.RadosNamespace = rbdVol.RadosNamespace rbdSnap.Monitors, rbdSnap.ClusterID, err = util.GetMonsAndClusterID(snapOptions) if err != nil { @@ -951,18 +976,22 @@ func (rv *rbdVolume) checkSnapExists(rbdSnap *rbdSnapshot) error { // rbdImageMetadataStash strongly typed JSON spec for stashed RBD image metadata. type rbdImageMetadataStash struct { - Version int `json:"Version"` - Pool string `json:"pool"` - ImageName string `json:"image"` - NbdAccess bool `json:"accessType"` - Encrypted bool `json:"encrypted"` + Version int `json:"Version"` + Pool string `json:"pool"` + RadosNamespace string `json:"radosNamespace"` + ImageName string `json:"image"` + NbdAccess bool `json:"accessType"` + Encrypted bool `json:"encrypted"` } // file name in which image metadata is stashed. const stashFileName = "image-meta.json" -// spec returns the image-spec (pool/image) format of the image. +// spec returns the image-spec (pool/{namespace/}image) format of the image. func (ri *rbdImageMetadataStash) String() string { + if ri.RadosNamespace != "" { + return fmt.Sprintf("%s/%s/%s", ri.Pool, ri.RadosNamespace, ri.ImageName) + } return fmt.Sprintf("%s/%s", ri.Pool, ri.ImageName) } @@ -971,10 +1000,11 @@ func (ri *rbdImageMetadataStash) String() string { func stashRBDImageMetadata(volOptions *rbdVolume, path string) error { var imgMeta = rbdImageMetadataStash{ // there are no checks for this at present - Version: 2, // nolint:gomnd // number specifies version. - Pool: volOptions.Pool, - ImageName: volOptions.RbdImageName, - Encrypted: volOptions.Encrypted, + Version: 2, // nolint:gomnd // number specifies version. + Pool: volOptions.Pool, + RadosNamespace: volOptions.RadosNamespace, + ImageName: volOptions.RbdImageName, + Encrypted: volOptions.Encrypted, } imgMeta.NbdAccess = false diff --git a/internal/rbd/snapshot.go b/internal/rbd/snapshot.go index 698a8d210..107bd9f78 100644 --- a/internal/rbd/snapshot.go +++ b/internal/rbd/snapshot.go @@ -88,6 +88,7 @@ func generateVolFromSnap(rbdSnap *rbdSnapshot) *rbdVolume { vol.Monitors = rbdSnap.Monitors vol.Pool = rbdSnap.Pool vol.JournalPool = rbdSnap.JournalPool + vol.RadosNamespace = rbdSnap.RadosNamespace vol.RbdImageName = rbdSnap.RbdSnapName vol.ImageID = rbdSnap.ImageID return vol diff --git a/internal/util/csiconfig.go b/internal/util/csiconfig.go index 4b3d16ae7..d0bfb1b4c 100644 --- a/internal/util/csiconfig.go +++ b/internal/util/csiconfig.go @@ -37,6 +37,8 @@ const ( type ClusterInfo struct { // ClusterID is used for unique identification ClusterID string `json:"clusterID"` + // Namespace is the namespace in the pool + RadosNamespace string `json:"radosNamespace"` // Monitors is monitor list for corresponding cluster ID Monitors []string `json:"monitors"` // CephFS contains CephFS specific options @@ -50,6 +52,7 @@ type ClusterInfo struct { // [ // { // "clusterID": "", +// "namespace": "", // "monitors": // [ // "", @@ -100,6 +103,15 @@ func Mons(pathToConfig, clusterID string) (string, error) { return strings.Join(cluster.Monitors, ","), nil } +// RadosNamespace returns the namespace for the given clusterID. +func RadosNamespace(pathToConfig, clusterID string) (string, error) { + cluster, err := readClusterInfo(pathToConfig, clusterID) + if err != nil { + return "", err + } + return cluster.RadosNamespace, nil +} + // CephFSSubvolumeGroup returns the subvolumeGroup for CephFS volumes. If not set, it returns the default value "csi". func CephFSSubvolumeGroup(pathToConfig, clusterID string) (string, error) { cluster, err := readClusterInfo(pathToConfig, clusterID)