mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cephfs: implement getFsName() with go-ceph

Browse Source 
Fixes: #1549
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-10-02 10:44:40 +02:00 committed by mergify[bot]
parent 0a3f9d3487
commit 157d2aff64
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
internal/cephfs/cephfs_util.go
View File

@ -23,17 +23,6 @@ import (
"github.com/ceph/ceph-csi/internal/util" "github.com/ceph/ceph-csi/internal/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 (vo *volumeOptions) getFscID(ctx context.Context) (int64, error) { func (vo *volumeOptions) getFscID(ctx context.Context) (int64, error) {
fsa, err := vo.conn.GetFSAdmin() fsa, err := vo.conn.GetFSAdmin()
if err != nil { if err != nil {
@ -91,30 +80,22 @@ func getMetadataPool(ctx context.Context, monitors string, cr *util.Credentials,
return "", fmt.Errorf("%w: fsName (%s) not found in Ceph cluster", util.ErrPoolNotFound, fsName) return "", fmt.Errorf("%w: fsName (%s) not found in Ceph cluster", util.ErrPoolNotFound, fsName)
} }
// CephFilesystemDump is a representation of the main json structure returned by 'ceph fs dump'. func (vo *volumeOptions) getFsName(ctx context.Context) (string, error) {
type CephFilesystemDump struct { fsa, err := vo.conn.GetFSAdmin()
Filesystems []CephFilesystemDetails `json:"filesystems"`
}
func (vo *volumeOptions) getFsName(ctx context.Context, cr *util.Credentials) (string, error) {
// ./tbox ceph fs dump --format=json
// JSON: {...,"filesystems":[{"mdsmap":{},"id":<n>},...],...}
var fsDump CephFilesystemDump
err := execCommandJSON(ctx, &fsDump,
"ceph",
"-m", vo.Monitors,
"--id", cr.ID,
"--keyfile="+cr.KeyFile,
"-c", util.CephConfigPath,
"fs", "dump", "--format=json",
)
if err != nil { if err != nil {
util.ErrorLog(ctx, "could not get FSAdmin, can not fetch filesystem name for ID %d:", vo.FscID, err)
return "", err return "", err
} }
for _, fs := range fsDump.Filesystems { volumes, err := fsa.EnumerateVolumes()
if fs.ID == vo.FscID { if err != nil {
return fs.MDSMap.FilesystemName, nil util.ErrorLog(ctx, "could not list volumes, can not fetch filesystem name for ID %d:", vo.FscID, err)
return "", err
}
for _, vol := range volumes {
if vol.ID == vo.FscID {
return vol.Name, nil
} }
} }

4
internal/cephfs/volumeoptions.go
View File

@ -283,7 +283,7 @@ func newVolumeOptionsFromVolID(ctx context.Context, volID string, volOpt, secret
return nil, nil, err return nil, nil, err
} }
volOptions.FsName, err = volOptions.getFsName(ctx, cr) volOptions.FsName, err = volOptions.getFsName(ctx)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
@ -478,7 +478,7 @@ func newSnapshotOptionsFromID(ctx context.Context, snapID string, cr *util.Crede
return &volOptions, nil, &sid, fmt.Errorf("failed to fetch subvolumegroup list using clusterID (%s): %w", vi.ClusterID, err) return &volOptions, nil, &sid, fmt.Errorf("failed to fetch subvolumegroup list using clusterID (%s): %w", vi.ClusterID, err)
} }
volOptions.FsName, err = volOptions.getFsName(ctx, cr) volOptions.FsName, err = volOptions.getFsName(ctx)
if err != nil { if err != nil {
return &volOptions, nil, &sid, err return &volOptions, nil, &sid, err
} }