mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-05-29 01:56:41 +00:00
rbd: add ParentInTrash parameter in rbdImage struct
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 c34b31ee05d56e7fcf0597f42b7ed5e2913a3cfd)
This commit is contained in:
parent
2ccb57a1cc
commit
3c68748c11
@ -116,6 +116,8 @@ type rbdImage struct {
|
||||
ParentName string
|
||||
// Parent Pool is the pool that contains the parent image.
|
||||
ParentPool string
|
||||
// ParentInTrash indicates the parent image is in trash.
|
||||
ParentInTrash bool
|
||||
// Cluster name
|
||||
ClusterName string
|
||||
|
||||
@ -1613,6 +1615,7 @@ func (ri *rbdImage) getImageInfo() error {
|
||||
} else {
|
||||
ri.ParentName = parentInfo.Image.ImageName
|
||||
ri.ParentPool = parentInfo.Image.PoolName
|
||||
ri.ParentInTrash = parentInfo.Image.Trash
|
||||
}
|
||||
// Get image creation time
|
||||
tm, err := image.GetCreateTimestamp()
|
||||
@ -1631,7 +1634,9 @@ func (ri *rbdImage) getParent() (*rbdImage, error) {
|
||||
if err != nil {
|
||||
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
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user