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

rbd: add ParentInTrash parameter in rbdImage struct

Browse Source 
This commit adds ParentInTrash parameter in rbdImage struct
and makes use of it in getParent() function in order to avoid
error in case the parent is present but in trash.

Signed-off-by: Rakshith R <rar@redhat.com>
(cherry picked from commit c34b31ee05)
This commit is contained in:
Rakshith R 2024-03-29 15:26:02 +05:30 committed by mergify[bot]
parent 2ccb57a1cc
commit 3c68748c11
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/rbd/rbd_util.go
View File

@ -116,6 +116,8 @@ type rbdImage struct {
ParentName string ParentName string
// Parent Pool is the pool that contains the parent image. // Parent Pool is the pool that contains the parent image.
ParentPool string ParentPool string
// ParentInTrash indicates the parent image is in trash.
ParentInTrash bool
// Cluster name // Cluster name
ClusterName string ClusterName string
@ -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
} }