From 63c458bd632d8958e60459fb804e2d0a36679717 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 12 May 2020 16:56:08 +0200 Subject: [PATCH] rbd: use rbdVolume.open() for metadata operations Signed-off-by: Niels de Vos --- internal/rbd/rbd_util.go | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go index b15d93b61..e200a64f8 100644 --- a/internal/rbd/rbd_util.go +++ b/internal/rbd/rbd_util.go @@ -1007,14 +1007,9 @@ func resizeRBDImage(rbdVol *rbdVolume, cr *util.Credentials) error { } func (rv *rbdVolume) GetMetadata(key string) (string, error) { - ioctx, err := rv.conn.GetIoctx(rv.Pool) + image, err := rv.open() if err != nil { - return "", errors.Wrapf(err, "failed to get ioctx for %q", rv.RbdImageName) - } - - image, err := librbd.OpenImage(ioctx, rv.RbdImageName, librbd.NoSnapshot) - if err != nil { - return "", errors.Wrapf(err, "could not open image %q", rv.RbdImageName) + return "", err } defer image.Close() @@ -1022,14 +1017,9 @@ func (rv *rbdVolume) GetMetadata(key string) (string, error) { } func (rv *rbdVolume) SetMetadata(key, value string) error { - ioctx, err := rv.conn.GetIoctx(rv.Pool) + image, err := rv.open() if err != nil { - return errors.Wrapf(err, "failed to get ioctx for %q", rv.RbdImageName) - } - - image, err := librbd.OpenImage(ioctx, rv.RbdImageName, librbd.NoSnapshot) - if err != nil { - return errors.Wrapf(err, "could not open image %q", rv.RbdImageName) + return err } defer image.Close()