From 824f38daaa1763c676c814d911ddf7a7579ef80c Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Wed, 15 Jan 2020 14:06:03 +0100
Subject: [PATCH] rbd: use go-ceph to implement getImageInfo()

Signed-off-by: Niels de Vos <ndevos@redhat.com>
---
 internal/rbd/rbd_util.go | 57 ++++++++++++----------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
index ade55edde..ac9b05a51 100644
--- a/internal/rbd/rbd_util.go
+++ b/internal/rbd/rbd_util.go
@@ -380,15 +380,7 @@ func updateSnapWithImageInfo(ctx context.Context, rbdSnap *rbdSnapshot, cr *util
 // updateVolWithImageInfo updates provided rbdVolume with information from on-disk data
 // regarding the same
 func updateVolWithImageInfo(ctx context.Context, rbdVol *rbdVolume, cr *util.Credentials) error {
-	imageInfo, err := rbdVol.getImageInfo(ctx, rbdVol.Monitors, cr)
-	if err != nil {
-		return err
-	}
-
-	rbdVol.VolSize = imageInfo.Size
-	rbdVol.ImageFeatures = strings.Join(imageInfo.Features, ",")
-
-	return nil
+	return rbdVol.getImageInfo()
 }
 
 // genSnapFromSnapID generates a rbdSnapshot structure from the provided identifier, updating
@@ -835,45 +827,30 @@ func getSnapshotMetadata(ctx context.Context, pSnapOpts *rbdSnapshot, cr *util.C
 	return nil
 }
 
-// imageInfo strongly typed JSON spec for image info
-type imageInfo struct {
-	ObjectUUID string   `json:"name"`
-	Size       int64    `json:"size"`
-	Features   []string `json:"features"`
-	CreatedAt  string   `json:"create_timestamp"`
-}
-
 // getImageInfo queries rbd about the given image and returns its metadata, and returns
 // ErrImageNotFound if provided image is not found
-func (rv *rbdVolume) getImageInfo(ctx context.Context, monitors string, cr *util.Credentials) (imageInfo, error) {
-	// rbd --format=json info [image-spec | snap-spec]
-
-	var imgInfo imageInfo
-
-	stdout, stderr, err := util.ExecCommand(
-		"rbd",
-		"-m", monitors,
-		"--id", cr.ID,
-		"--keyfile="+cr.KeyFile,
-		"-c", util.CephConfigPath,
-		"--format="+"json",
-		"info", rv.String())
+func (rv *rbdVolume) getImageInfo() error {
+	image, err := rv.open()
 	if err != nil {
-		klog.Errorf(util.Log(ctx, "failed getting information for image (%s): (%s)"), rv, err)
-		if strings.Contains(string(stderr), "rbd: error opening image "+rv.RbdImageName+
-			": (2) No such file or directory") {
-			return imgInfo, ErrImageNotFound{rv.String(), err}
-		}
-		return imgInfo, err
+		return err
 	}
+	defer image.Close()
 
-	err = json.Unmarshal(stdout, &imgInfo)
+	imageInfo, err := image.Stat()
 	if err != nil {
-		klog.Errorf(util.Log(ctx, "failed to parse JSON output of image info (%s): (%s)"), rv, err)
-		return imgInfo, fmt.Errorf("unmarshal failed: %+v.  raw buffer response: %s", err, string(stdout))
+		return err
 	}
+	// TODO: can rv.VolSize not be a uint64? Or initialize it to -1?
+	rv.VolSize = int64(imageInfo.Size)
 
-	return imgInfo, nil
+	features, err := image.GetFeatures()
+	if err != nil {
+		return err
+	}
+	fs := librbd.FeatureSet(features)
+	rv.ImageFeatures = strings.Join(fs.Names(), ",")
+
+	return nil
 }
 
 // snapInfo strongly typed JSON spec for snap ls rbd output