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

cleanup: use rbdImage.Destroy() for temporary volumes

Browse Source 
rbdVolumes can have several resources that get allocated during its
usage. Only destroying the IOContext may not be suffiecient and can
cause resource leaks.

Use rbdVolume.Destroy() when the rbdVolume is not used anymore.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-03-15 10:58:29 +01:00 committed by mergify[bot]
parent 5c26fbb0d7
commit bbd24e52f3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/rbd/rbd_util.go
View File

@ -493,6 +493,8 @@ func deleteImage(ctx context.Context, pOpts *rbdVolume, cr *util.Credentials) er
func (rv *rbdVolume) getCloneDepth(ctx context.Context) (uint, error) { func (rv *rbdVolume) getCloneDepth(ctx context.Context) (uint, error) {
var depth uint var depth uint
vol := rbdVolume{} vol := rbdVolume{}
defer vol.Destroy()
vol.Pool = rv.Pool vol.Pool = rv.Pool
vol.Monitors = rv.Monitors vol.Monitors = rv.Monitors
vol.RbdImageName = rv.RbdImageName vol.RbdImageName = rv.RbdImageName
@ -503,9 +505,6 @@ func (rv *rbdVolume) getCloneDepth(ctx context.Context) (uint, error) {
return depth, err return depth, err
} }
defer func() {
vol.ioctx.Destroy()
}()
for { for {
if vol.RbdImageName == "" { if vol.RbdImageName == "" {
return depth, nil return depth, nil
@ -662,6 +661,8 @@ func (rv *rbdVolume) hasFeature(feature uint64) bool {
func (rv *rbdVolume) checkImageChainHasFeature(ctx context.Context, feature uint64) (bool, error) { func (rv *rbdVolume) checkImageChainHasFeature(ctx context.Context, feature uint64) (bool, error) {
vol := rbdVolume{} vol := rbdVolume{}
defer vol.Destroy()
vol.Pool = rv.Pool vol.Pool = rv.Pool
vol.RadosNamespace = rv.RadosNamespace vol.RadosNamespace = rv.RadosNamespace
vol.Monitors = rv.Monitors vol.Monitors = rv.Monitors
@ -672,7 +673,6 @@ func (rv *rbdVolume) checkImageChainHasFeature(ctx context.Context, feature uint
if err != nil { if err != nil {
return false, err return false, err
} }
defer vol.ioctx.Destroy()
for { for {
if vol.RbdImageName == "" { if vol.RbdImageName == "" {