mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-12-23 21:40:20 +00:00
c5762b6b5c
RBD plugin needs only a single ID to manage images and operations against a pool, mentioned in the storage class. The current scheme of 2 IDs is hence not needed and removed in this commit. Further, unlike CephFS plugin, the RBD plugin splits the user id and the key into the storage class and the secret respectively. Also the parameter name for the key in the secret is noted in the storageclass making it a variant and hampers usability/comprehension. This is also fixed by moving the id and the key to the secret and not retaining the same in the storage class, like CephFS. Fixes #270 Testing done: - Basic PVC creation and mounting Signed-off-by: ShyamsundarR <srangana@redhat.com>
118 lines
3.1 KiB
Go
118 lines
3.1 KiB
Go
/*
|
|
Copyright 2019 The Ceph-CSI Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package cephfs
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/ceph/ceph-csi/pkg/util"
|
|
)
|
|
|
|
// MDSMap is a representation of the mds map sub-structure returned by 'ceph fs get'
|
|
type MDSMap struct {
|
|
FilesystemName string `json:"fs_name"`
|
|
}
|
|
|
|
// CephFilesystemDetails is a representation of the main json structure returned by 'ceph fs get'
|
|
type CephFilesystemDetails struct {
|
|
ID int64 `json:"id"`
|
|
MDSMap MDSMap `json:"mdsmap"`
|
|
}
|
|
|
|
func getFscID(monitors string, cr *util.Credentials, fsName string) (int64, error) {
|
|
// ceph fs get myfs --format=json
|
|
// {"mdsmap":{...},"id":2}
|
|
var fsDetails CephFilesystemDetails
|
|
err := execCommandJSON(&fsDetails,
|
|
"ceph",
|
|
"-m", monitors,
|
|
"--id", cr.ID,
|
|
"--key="+cr.Key,
|
|
"-c", util.CephConfigPath,
|
|
"fs", "get", fsName, "--format=json",
|
|
)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
|
|
return fsDetails.ID, nil
|
|
}
|
|
|
|
// CephFilesystem is a representation of the json structure returned by 'ceph fs ls'
|
|
type CephFilesystem struct {
|
|
Name string `json:"name"`
|
|
MetadataPool string `json:"metadata_pool"`
|
|
MetadataPoolID int `json:"metadata_pool_id"`
|
|
DataPools []string `json:"data_pools"`
|
|
DataPoolIDs []int `json:"data_pool_ids"`
|
|
}
|
|
|
|
func getMetadataPool(monitors string, cr *util.Credentials, fsName string) (string, error) {
|
|
// ./tbox ceph fs ls --format=json
|
|
// [{"name":"myfs","metadata_pool":"myfs-metadata","metadata_pool_id":4,...},...]
|
|
var filesystems []CephFilesystem
|
|
err := execCommandJSON(&filesystems,
|
|
"ceph",
|
|
"-m", monitors,
|
|
"--id", cr.ID,
|
|
"--key="+cr.Key,
|
|
"-c", util.CephConfigPath,
|
|
"fs", "ls", "--format=json",
|
|
)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
for _, fs := range filesystems {
|
|
if fs.Name == fsName {
|
|
return fs.MetadataPool, nil
|
|
}
|
|
}
|
|
|
|
return "", fmt.Errorf("fsName (%s) not found in Ceph cluster", fsName)
|
|
}
|
|
|
|
// CephFilesystemDetails is a representation of the main json structure returned by 'ceph fs dump'
|
|
type CephFilesystemDump struct {
|
|
Filesystems []CephFilesystemDetails `json:"filesystems"`
|
|
}
|
|
|
|
func getFsName(monitors string, cr *util.Credentials, fscID int64) (string, error) {
|
|
// ./tbox ceph fs dump --format=json
|
|
// JSON: {...,"filesystems":[{"mdsmap":{},"id":<n>},...],...}
|
|
var fsDump CephFilesystemDump
|
|
err := execCommandJSON(&fsDump,
|
|
"ceph",
|
|
"-m", monitors,
|
|
"--id", cr.ID,
|
|
"--key="+cr.Key,
|
|
"-c", util.CephConfigPath,
|
|
"fs", "dump", "--format=json",
|
|
)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
|
|
for _, fs := range fsDump.Filesystems {
|
|
if fs.ID == fscID {
|
|
return fs.MDSMap.FilesystemName, nil
|
|
}
|
|
}
|
|
|
|
return "", fmt.Errorf("fscID (%d) not found in Ceph cluster", fscID)
|
|
}
|