mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-12-26 06:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: add layering & deep flattenfeatures for groupsnapshot image

Browse Source 
Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit 50b2a0528e)
This commit is contained in:
Rakshith R 2024-12-05 19:47:55 +05:30 committed by mergify[bot]
parent 12c9a8c2e0
commit 8fcb438794
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/rbd/controllerserver.go
View File

@ -629,8 +629,10 @@ func flattenTemporaryClonedImages(ctx context.Context, rbdVol *rbdVolume, cr *ut
} }
// If we start flattening all the snapshots at one shot the volume // If we start flattening all the snapshots at one shot the volume
// creation time will be affected,so we will flatten only the extra // creation time will be affected,so we will flatten only the extra
// snapshots. // snapshots. Use the min of the extra snapshots and the number of children
extraSnapshots := min(len(snaps)-int(minSnapshotsOnImageToStartFlatten), len(children)) // to avoid scenario where number of children are less than the extra snapshots.
// This occurs when the child images are in trash and not yet deleted.
extraSnapshots := min((len(snaps) - int(minSnapshotsOnImageToStartFlatten)), len(children))
children = children[:extraSnapshots] children = children[:extraSnapshots]
err = flattenClonedRbdImages( err = flattenClonedRbdImages(
ctx, ctx,

4
internal/rbd/snapshot.go
View File

@ -276,6 +276,10 @@ func (rv *rbdVolume) NewSnapshotByID(
return nil, err return nil, err
} }
// set the features for the clone image.
f := []string{librbd.FeatureNameLayering, librbd.FeatureNameDeepFlatten}
rv.ImageFeatureSet = librbd.FeatureSetFromNames(f)
options, err := rv.constructImageOptions(ctx) options, err := rv.constructImageOptions(ctx)
if err != nil { if err != nil {
return nil, err return nil, err