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

cephfs: make getCloneState() a method of volumeOptions

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-11-04 09:10:39 +01:00 committed by mergify[bot]
parent 66aa595e77
commit 476ad18d2e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/cephfs/clone.go
View File

@ -93,7 +93,7 @@ func createCloneFromSubvolume(ctx context.Context, volID, cloneID volumeID, volO
return cloneErr
}
cloneState, cloneErr := getCloneState(ctx, volOpt, cr, cloneID)
cloneState, cloneErr := volOpt.getCloneState(ctx, cr, cloneID)
if cloneErr != nil {
return cloneErr
}
@ -183,7 +183,7 @@ func createCloneFromSnapshot(ctx context.Context, parentVolOpt, volOptions *volu
}
}()
cloneState, err := getCloneState(ctx, volOptions, cr, volumeID(vID.FsSubvolName))
cloneState, err := volOptions.getCloneState(ctx, cr, volumeID(vID.FsSubvolName))
if err != nil {
return err
}
@ -208,7 +208,7 @@ func createCloneFromSnapshot(ctx context.Context, parentVolOpt, volOptions *volu
return nil
}
func getCloneState(ctx context.Context, volOptions *volumeOptions, cr *util.Credentials, volID volumeID) (cephFSCloneState, error) {
func (vo *volumeOptions) getCloneState(ctx context.Context, cr *util.Credentials, volID volumeID) (cephFSCloneState, error) {
type cloneStatus struct {
Status struct {
State string `json:"state"`
@ -220,11 +220,11 @@ func getCloneState(ctx context.Context, volOptions *volumeOptions, cr *util.Cred
"fs",
"clone",
"status",
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,
@ -236,7 +236,7 @@ func getCloneState(ctx context.Context, volOptions *volumeOptions, cr *util.Cred
"ceph",
args[:]...)
if err != nil {
util.ErrorLog(ctx, "failed to get subvolume clone info %s(%s) in fs %s", string(volID), err, volOptions.FsName)
util.ErrorLog(ctx, "failed to get subvolume clone info %s(%s) in fs %s", string(volID), err, vo.FsName)
return cephFSCloneError, err
}
return cephFSCloneState(cs.Status.State), nil

6
internal/cephfs/fsjournal.go
View File

@ -83,9 +83,9 @@ func checkVolExists(ctx context.Context,
vid.FsSubvolName = imageData.ImageAttributes.ImageName
if sID != nil || pvID != nil {
cloneState, cloneInfoErr := getCloneState(ctx, volOptions, cr, volumeID(vid.FsSubvolName))
if cloneInfoErr != nil {
if errors.Is(cloneInfoErr, ErrVolumeNotFound) {
cloneState, cloneStateErr := volOptions.getCloneState(ctx, cr, volumeID(vid.FsSubvolName))
if cloneStateErr != nil {
if errors.Is(cloneStateErr, ErrVolumeNotFound) {
if pvID != nil {
err = cleanupCloneFromSubvolumeSnapshot(
ctx, volumeID(pvID.FsSubvolName),