mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-11-14 02:10:21 +00:00
b9cd0e18ad
This is a part of the stateless set of commits for CephCSI. This commit removes the dependency on config maps to store cephFS provisioned volumes, and instead relies on RADOS based objects and keys, and required CSI VolumeID encoding to detect the provisioned volumes. Changes: - Provide backward compatibility to provisioned volumes by older plugin versions (1.0.0 or older) - Remove Create/Delete support for statically provisioned volumes (fixes #382) - Added namespace support to RADOS OMaps and used the same to store RADOS CSI objects and keys in the CephFS metadata pool - Added support to mention fsname for CephFS provisioning (fixes #359) - Changed field name in CSI Identifier to 'location', to denote a pool or fscid - Updated mounter cache to use new scheme - Required Helm manifests are updated - Required documentation and other manifests are updated - Made driver option 'metadatastorage' as optional, as fresh installs do not need to specify the same Testing done: - Create/Mount/Delete PVC - Create/Delete 5 PVCs - Mount version 1.0.0 PVC - Delete version 1.0.0 PV - Mount Statically defined PV/PVC/Pod - Mount Statically defined version 1.0.0 PV/PVC/Pod - Delete Statically defined version 1.0.0 PV/PVC/Pod - Node restart when mounted to test mountcache - Use InstanceID other than 'default' - RBD basic round of tests, as namespace is added to OMaps - csitest against ceph-fs plugin - NOTE: CephFS plugin still does not detect and address already created volumes but of a different size - Test not providing any value to the metadata storage parameter Signed-off-by: ShyamsundarR <srangana@redhat.com>
118 lines
3.0 KiB
Go
118 lines
3.0 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, id, key, fsName string) (int64, error) {
|
|
// ceph fs get myfs --format=json
|
|
// {"mdsmap":{...},"id":2}
|
|
var fsDetails CephFilesystemDetails
|
|
err := execCommandJSON(&fsDetails,
|
|
"ceph",
|
|
"-m", monitors,
|
|
"--id", id,
|
|
"--key="+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, id, key, 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", id,
|
|
"--key="+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, id, key string, 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", id,
|
|
"--key="+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)
|
|
}
|