mirror of https://github.com/ceph/go-ceph
rbd: replace deprecated rbd_get_parent_info() with rbd_get_parent()
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
parent
efe2f6b97c
commit
92fc7ac0bf
23
rbd/rbd.go
23
rbd/rbd.go
|
@ -1015,29 +1015,6 @@ func (image *Image) GetSnapshot(snapname string) *Snapshot {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// int rbd_get_parent_info(rbd_image_t image,
|
|
||||||
// char *parent_pool_name, size_t ppool_namelen, char *parent_name,
|
|
||||||
// size_t pnamelen, char *parent_snap_name, size_t psnap_namelen)
|
|
||||||
func (image *Image) GetParentInfo(p_pool, p_name, p_snapname []byte) error {
|
|
||||||
if err := image.validate(imageIsOpen); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
ret := C.rbd_get_parent_info(
|
|
||||||
image.image,
|
|
||||||
(*C.char)(unsafe.Pointer(&p_pool[0])),
|
|
||||||
(C.size_t)(len(p_pool)),
|
|
||||||
(*C.char)(unsafe.Pointer(&p_name[0])),
|
|
||||||
(C.size_t)(len(p_name)),
|
|
||||||
(*C.char)(unsafe.Pointer(&p_snapname[0])),
|
|
||||||
(C.size_t)(len(p_snapname)))
|
|
||||||
if ret == 0 {
|
|
||||||
return nil
|
|
||||||
} else {
|
|
||||||
return RBDError(ret)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// int rbd_metadata_get(rbd_image_t image, const char *key, char *value, size_t *vallen)
|
// int rbd_metadata_get(rbd_image_t image, const char *key, char *value, size_t *vallen)
|
||||||
func (image *Image) GetMetadata(key string) (string, error) {
|
func (image *Image) GetMetadata(key string) (string, error) {
|
||||||
if err := image.validate(imageIsOpen); err != nil {
|
if err := image.validate(imageIsOpen); err != nil {
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
// +build luminous mimic
|
||||||
|
// +build !nautilus
|
||||||
|
//
|
||||||
|
// Ceph Nautilus introduced rbd_get_parent() and deprecated rbd_get_parent_info().
|
||||||
|
// Ceph Nautilus introduced rbd_list_children3() and deprecated rbd_list_children().
|
||||||
|
|
||||||
|
package rbd
|
||||||
|
|
||||||
|
// #cgo LDFLAGS: -lrbd
|
||||||
|
// #include <rbd/librbd.h>
|
||||||
|
// #include <errno.h>
|
||||||
|
import "C"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetParentInfo looks for the parent of the image and stores the pool, name
|
||||||
|
// and snapshot-name in the byte-arrays that are passed as arguments.
|
||||||
|
//
|
||||||
|
// Implements:
|
||||||
|
// int rbd_get_parent_info(rbd_image_t image, char *parent_pool_name,
|
||||||
|
// size_t ppool_namelen, char *parent_name,
|
||||||
|
// size_t pnamelen, char *parent_snap_name,
|
||||||
|
// size_t psnap_namelen)
|
||||||
|
func (image *Image) GetParentInfo(p_pool, p_name, p_snapname []byte) error {
|
||||||
|
if err := image.validate(imageIsOpen); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
ret := C.rbd_get_parent_info(
|
||||||
|
image.image,
|
||||||
|
(*C.char)(unsafe.Pointer(&p_pool[0])),
|
||||||
|
(C.size_t)(len(p_pool)),
|
||||||
|
(*C.char)(unsafe.Pointer(&p_name[0])),
|
||||||
|
(C.size_t)(len(p_name)),
|
||||||
|
(*C.char)(unsafe.Pointer(&p_snapname[0])),
|
||||||
|
(C.size_t)(len(p_snapname)))
|
||||||
|
if ret == 0 {
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
|
return RBDError(ret)
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,65 @@
|
||||||
|
// +build !luminous,!mimic
|
||||||
|
//
|
||||||
|
// Ceph Nautilus introduced rbd_get_parent() and deprecated rbd_get_parent_info().
|
||||||
|
// Ceph Nautilus introduced rbd_list_children3() and deprecated rbd_list_children().
|
||||||
|
|
||||||
|
package rbd
|
||||||
|
|
||||||
|
// #cgo LDFLAGS: -lrbd
|
||||||
|
// #include <rbd/librbd.h>
|
||||||
|
// #include <errno.h>
|
||||||
|
import "C"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"unsafe"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetParentInfo looks for the parent of the image and stores the pool, name
|
||||||
|
// and snapshot-name in the byte-arrays that are passed as arguments.
|
||||||
|
//
|
||||||
|
// Implements:
|
||||||
|
// int rbd_get_parent(rbd_image_t image,
|
||||||
|
// rbd_linked_image_spec_t *parent_image,
|
||||||
|
// rbd_snap_spec_t *parent_snap)
|
||||||
|
func (image *Image) GetParentInfo(pool, name, snapname []byte) error {
|
||||||
|
if err := image.validate(imageIsOpen); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
parentImage := C.rbd_linked_image_spec_t{}
|
||||||
|
parentSnap := C.rbd_snap_spec_t{}
|
||||||
|
ret := C.rbd_get_parent(image.image, &parentImage, &parentSnap)
|
||||||
|
if ret != 0 {
|
||||||
|
return RBDError(ret)
|
||||||
|
}
|
||||||
|
|
||||||
|
defer C.rbd_linked_image_spec_cleanup(&parentImage)
|
||||||
|
defer C.rbd_snap_spec_cleanup(&parentSnap)
|
||||||
|
|
||||||
|
strlen := int(C.strlen(parentImage.pool_name))
|
||||||
|
if len(pool) < strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
if copy(pool, C.GoString(parentImage.pool_name)) != strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
|
||||||
|
strlen = int(C.strlen(parentImage.image_name))
|
||||||
|
if len(name) < strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
if copy(name, C.GoString(parentImage.image_name)) != strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
|
||||||
|
strlen = int(C.strlen(parentSnap.name))
|
||||||
|
if len(snapname) < strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
if copy(snapname, C.GoString(parentSnap.name)) != strlen {
|
||||||
|
return RBDError(C.ERANGE)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
Loading…
Reference in New Issue