From 429f7acd8fa3a3688597ba056a98b55a78d88b45 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 9 Oct 2020 17:20:16 +0200 Subject: [PATCH] cephfs: make getSubVolumeInfo() a method of volumeOptions Signed-off-by: Niels de Vos --- internal/cephfs/controllerserver.go | 2 +- internal/cephfs/volume.go | 8 ++++---- internal/cephfs/volumeoptions.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/cephfs/controllerserver.go b/internal/cephfs/controllerserver.go index bb1590f3c..2c6b6e90d 100644 --- a/internal/cephfs/controllerserver.go +++ b/internal/cephfs/controllerserver.go @@ -513,7 +513,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS // request to create snapshot. // TODO: For this purpose we could make use of cached clusterAdditionalInfo too. var info Subvolume - info, err = getSubVolumeInfo(ctx, parentVolOptions, cr, volumeID(vid.FsSubvolName)) + info, err = parentVolOptions.getSubVolumeInfo(ctx, cr, volumeID(vid.FsSubvolName)) if err != nil { // Check error code value against ErrInvalidCommand to understand the cluster // support it or not, its safe to evaluat as the filtering diff --git a/internal/cephfs/volume.go b/internal/cephfs/volume.go index 43ca23f51..fa43a5cb0 100644 --- a/internal/cephfs/volume.go +++ b/internal/cephfs/volume.go @@ -94,7 +94,7 @@ func getVolumeRootPathCeph(ctx context.Context, volOptions *volumeOptions, cr *u return strings.TrimSuffix(stdout, "\n"), nil } -func getSubVolumeInfo(ctx context.Context, volOptions *volumeOptions, cr *util.Credentials, volID volumeID) (Subvolume, error) { +func (vo *volumeOptions) getSubVolumeInfo(ctx context.Context, cr *util.Credentials, volID volumeID) (Subvolume, error) { info := Subvolume{} err := execCommandJSON( ctx, @@ -103,11 +103,11 @@ func getSubVolumeInfo(ctx context.Context, volOptions *volumeOptions, cr *util.C "fs", "subvolume", "info", - volOptions.FsName, + vo.FsName, string(volID), "--group_name", - volOptions.SubvolumeGroup, - "-m", volOptions.Monitors, + vo.SubvolumeGroup, + "-m", vo.Monitors, "-c", util.CephConfigPath, "-n", cephEntityClientPrefix+cr.ID, "--keyfile="+cr.KeyFile) diff --git a/internal/cephfs/volumeoptions.go b/internal/cephfs/volumeoptions.go index 2c1790e2b..325816848 100644 --- a/internal/cephfs/volumeoptions.go +++ b/internal/cephfs/volumeoptions.go @@ -339,7 +339,7 @@ func newVolumeOptionsFromVolID(ctx context.Context, volID string, volOpt, secret volOptions.ProvisionVolume = true - info, err = getSubVolumeInfo(ctx, &volOptions, cr, volumeID(vid.FsSubvolName)) + info, err = volOptions.getSubVolumeInfo(ctx, cr, volumeID(vid.FsSubvolName)) if err == nil { volOptions.RootPath = info.Path volOptions.Features = info.Features @@ -525,7 +525,7 @@ func newSnapshotOptionsFromID(ctx context.Context, snapID string, cr *util.Crede sid.FsSnapshotName = imageAttributes.ImageName sid.FsSubvolName = imageAttributes.SourceName - subvolInfo, err := getSubVolumeInfo(ctx, &volOptions, cr, volumeID(sid.FsSubvolName)) + subvolInfo, err := volOptions.getSubVolumeInfo(ctx, cr, volumeID(sid.FsSubvolName)) if err != nil { return &volOptions, nil, &sid, err }