mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-01-18 02:39:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #298 from Rakshith-R/BZ-snap-dead

Browse Source 
BUG 2264900: rbd: add ParentInTrash parameter in rbdImage struct
This commit is contained in:
openshift-merge-bot[bot] 2024-04-25 10:26:09 +00:00 committed by GitHub
commit 5400d8aa68
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
e2e/rbd.go
View File

@ -3552,7 +3552,7 @@ var _ = Describe("RBD", func() {
validateRBDImageCount(f, 1, defaultRBDPool) validateRBDImageCount(f, 1, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType) validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
for i := 0; i < snapChainDepth; i++ { for i := 0; i < snapChainDepth; i++ {
var pvcClone *v1.PersistentVolumeClaim var pvcClone, smartClonePVC *v1.PersistentVolumeClaim
snap := getSnapshot(snapshotPath) snap := getSnapshot(snapshotPath)
snap.Name = fmt.Sprintf("%s-%d", snap.Name, i) snap.Name = fmt.Sprintf("%s-%d", snap.Name, i)
snap.Namespace = f.UniqueName snap.Namespace = f.UniqueName
@ -3609,6 +3609,41 @@ var _ = Describe("RBD", func() {
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType) validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
validateOmapCount(f, 0, rbdType, defaultRBDPool, snapsType) validateOmapCount(f, 0, rbdType, defaultRBDPool, snapsType)
// create pvc-pvc clone to validate pvc-pvc clone creation
// of child PVC created from a snapshot which no longer exits.
// Snapshot-> restore PVC -> delete Snapshot -> PVC-PVC clone.
smartClonePVC, err = loadPVC(pvcSmartClonePath)
if err != nil {
framework.Failf("failed to load smart clone PVC: %v", err)
}
smartClonePVC.Name = fmt.Sprintf("%s-%d", smartClonePVC.Name, i)
smartClonePVC.Namespace = f.UniqueName
smartClonePVC.Spec.DataSource.Name = pvcClone.Name
err = createPVCAndvalidatePV(f.ClientSet, smartClonePVC, deployTimeout)
if err != nil {
framework.Failf("failed to create smart clone PVC %q: %v",
smartClonePVC.Name, err)
}
// validate created backend rbd images = clone + smart clone + temp image
totalImages = 3
validateRBDImageCount(f, totalImages, defaultRBDPool)
validateOmapCount(f, 2, rbdType, defaultRBDPool, volumesType)
validateOmapCount(f, 0, rbdType, defaultRBDPool, snapsType)
err = deletePVCAndValidatePV(f.ClientSet, smartClonePVC, deployTimeout)
if err != nil {
framework.Failf("failed to delete smart clone PVC %q: %v",
smartClonePVC.Name, err)
}
// validate created backend rbd images = clone
totalImages = 1
validateRBDImageCount(f, totalImages, defaultRBDPool)
validateOmapCount(f, 1, rbdType, defaultRBDPool, volumesType)
validateOmapCount(f, 0, rbdType, defaultRBDPool, snapsType)
app.Spec.Volumes[0].PersistentVolumeClaim.ClaimName = pvcClone.Name app.Spec.Volumes[0].PersistentVolumeClaim.ClaimName = pvcClone.Name
// create application // create application
err = createApp(f.ClientSet, app, deployTimeout) err = createApp(f.ClientSet, app, deployTimeout)

7
internal/rbd/rbd_util.go
View File

@ -146,6 +146,8 @@ type rbdImage struct {
// Set metadata on volume // Set metadata on volume
EnableMetadata bool EnableMetadata bool
// ParentInTrash indicates the parent image is in trash.
ParentInTrash bool
} }
// rbdVolume represents a CSI volume and its RBD image specifics. // rbdVolume represents a CSI volume and its RBD image specifics.
@ -1613,6 +1615,7 @@ func (ri *rbdImage) getImageInfo() error {
} else { } else {
ri.ParentName = parentInfo.Image.ImageName ri.ParentName = parentInfo.Image.ImageName
ri.ParentPool = parentInfo.Image.PoolName ri.ParentPool = parentInfo.Image.PoolName
ri.ParentInTrash = parentInfo.Image.Trash
} }
// Get image creation time // Get image creation time
tm, err := image.GetCreateTimestamp() tm, err := image.GetCreateTimestamp()
@ -1631,7 +1634,9 @@ func (ri *rbdImage) getParent() (*rbdImage, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if ri.ParentName == "" { // The image may not have a parent or the parent maybe in trash.
// Return nil in both the cases.
if ri.ParentName == "" || ri.ParentInTrash {
return nil, nil return nil, nil
} }