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

rbd: use rbdVolume.open() for metadata operations

Browse Source 
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2020-05-12 16:56:08 +02:00 committed by mergify[bot]
parent 7a18e68a6e
commit 63c458bd63
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/rbd/rbd_util.go
View File

@ -1007,14 +1007,9 @@ func resizeRBDImage(rbdVol *rbdVolume, cr *util.Credentials) error {
} }
func (rv *rbdVolume) GetMetadata(key string) (string, error) { func (rv *rbdVolume) GetMetadata(key string) (string, error) {
ioctx, err := rv.conn.GetIoctx(rv.Pool) image, err := rv.open()
if err != nil { if err != nil {
return "", errors.Wrapf(err, "failed to get ioctx for %q", rv.RbdImageName) return "", err
}
image, err := librbd.OpenImage(ioctx, rv.RbdImageName, librbd.NoSnapshot)
if err != nil {
return "", errors.Wrapf(err, "could not open image %q", rv.RbdImageName)
} }
defer image.Close() defer image.Close()
@ -1022,14 +1017,9 @@ func (rv *rbdVolume) GetMetadata(key string) (string, error) {
} }
func (rv *rbdVolume) SetMetadata(key, value string) error { func (rv *rbdVolume) SetMetadata(key, value string) error {
ioctx, err := rv.conn.GetIoctx(rv.Pool) image, err := rv.open()
if err != nil { if err != nil {
return errors.Wrapf(err, "failed to get ioctx for %q", rv.RbdImageName) return err
}
image, err := librbd.OpenImage(ioctx, rv.RbdImageName, librbd.NoSnapshot)
if err != nil {
return errors.Wrapf(err, "could not open image %q", rv.RbdImageName)
} }
defer image.Close() defer image.Close()