From b3f1499cd425017de61898edb1d71dac7297e7d3 Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Wed, 24 Jun 2020 12:39:11 +0530
Subject: [PATCH] rbd: remove unused snapshot function

we dont need to call the snapshot CLI functions
to get snapshot details. as these details are not
requried with new snapshot design.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
---
 internal/rbd/controllerserver.go |  8 +----
 internal/rbd/rbd_journal.go      | 11 -------
 internal/rbd/rbd_util.go         | 54 --------------------------------
 3 files changed, 1 insertion(+), 72 deletions(-)

diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go
index 82adfe4e3..1edc2c48b 100644
--- a/internal/rbd/controllerserver.go
+++ b/internal/rbd/controllerserver.go
@@ -641,13 +641,7 @@ func (cs *ControllerServer) doSnapshot(ctx context.Context, rbdSnap *rbdSnapshot
 			err = status.Error(codes.Internal, err.Error())
 		}
 	}()
-	err = getSnapshotMetadata(ctx, rbdSnap, cr)
-	if err != nil {
-		klog.Errorf(util.Log(ctx, "failed to fetch snapshot metadata: %v"), err)
-		return status.Error(codes.Internal, err.Error())
-	}
-
-	return nil
+	return err
 }
 
 // DeleteSnapshot deletes the snapshot in backend and removes the
diff --git a/internal/rbd/rbd_journal.go b/internal/rbd/rbd_journal.go
index ed8911fa5..38ab53a0c 100644
--- a/internal/rbd/rbd_journal.go
+++ b/internal/rbd/rbd_journal.go
@@ -137,17 +137,6 @@ func checkSnapExists(ctx context.Context, rbdSnap *rbdSnapshot, cr *util.Credent
 			snapData.ImagePool, rbdSnap.Pool)
 	}
 
-	// Fetch on-disk image attributes
-	err = updateSnapWithImageInfo(ctx, rbdSnap, cr)
-	if err != nil {
-		if _, ok := err.(ErrSnapNotFound); ok {
-			err = j.UndoReservation(ctx, rbdSnap.JournalPool,
-				rbdSnap.Pool, rbdSnap.RbdSnapName, rbdSnap.RequestName)
-			return false, err
-		}
-		return false, err
-	}
-
 	// found a snapshot already available, process and return its information
 	rbdSnap.SnapID, err = util.GenerateVolID(ctx, rbdSnap.Monitors, cr, snapData.ImagePoolID, rbdSnap.Pool,
 		rbdSnap.ClusterID, snapUUID, volIDVersion)
diff --git a/internal/rbd/rbd_util.go b/internal/rbd/rbd_util.go
index fde7f4528..ef6018469 100644
--- a/internal/rbd/rbd_util.go
+++ b/internal/rbd/rbd_util.go
@@ -33,7 +33,6 @@ import (
 	"github.com/ceph/go-ceph/rados"
 	librbd "github.com/ceph/go-ceph/rbd"
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
@@ -415,26 +414,6 @@ func (rv *rbdVolume) removeImageFromTrash() error {
 	return nil
 }
 
-// updateSnapWithImageInfo updates provided rbdSnapshot with information from on-disk data
-// regarding the same
-func updateSnapWithImageInfo(ctx context.Context, rbdSnap *rbdSnapshot, cr *util.Credentials) error {
-	snapInfo, err := rbdSnap.getSnapInfo(ctx, rbdSnap.Monitors, cr)
-	if err != nil {
-		return err
-	}
-
-	rbdSnap.SizeBytes = snapInfo.Size
-
-	tm, err := time.Parse(time.ANSIC, snapInfo.Timestamp)
-	if err != nil {
-		return err
-	}
-
-	rbdSnap.CreatedAt, err = ptypes.TimestampProto(tm)
-
-	return err
-}
-
 // genSnapFromSnapID generates a rbdSnapshot structure from the provided identifier, updating
 // the structure with elements from on-disk snapshot metadata as well
 func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID string, cr *util.Credentials) error {
@@ -490,8 +469,6 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str
 		}
 	}
 
-	err = updateSnapWithImageInfo(ctx, rbdSnap, cr)
-
 	return err
 }
 
@@ -802,29 +779,6 @@ func restoreSnapshot(ctx context.Context, pVolOpts *rbdVolume, pSnapOpts *rbdSna
 	return nil
 }
 
-// getSnapshotMetadata fetches on-disk metadata about the snapshot and populates the passed in
-// rbdSnapshot structure
-func getSnapshotMetadata(ctx context.Context, pSnapOpts *rbdSnapshot, cr *util.Credentials) error {
-	snapInfo, err := pSnapOpts.getSnapInfo(ctx, pSnapOpts.Monitors, cr)
-	if err != nil {
-		return err
-	}
-
-	pSnapOpts.SizeBytes = snapInfo.Size
-
-	tm, err := time.Parse(time.ANSIC, snapInfo.Timestamp)
-	if err != nil {
-		return err
-	}
-
-	pSnapOpts.CreatedAt, err = ptypes.TimestampProto(tm)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // getImageInfo queries rbd about the given image and returns its metadata, and returns
 // ErrImageNotFound if provided image is not found
 func (rv *rbdVolume) getImageInfo() error {
@@ -850,14 +804,6 @@ func (rv *rbdVolume) getImageInfo() error {
 	return nil
 }
 
-// snapInfo strongly typed JSON spec for snap ls rbd output
-type snapInfo struct {
-	ID        int64  `json:"id"`
-	Name      string `json:"name"`
-	Size      int64  `json:"size"`
-	Timestamp string `json:"timestamp"`
-}
-
 /*
 getSnapInfo queries rbd about the snapshots of the given image and returns its metadata, and
 returns ErrImageNotFound if provided image is not found, and ErrSnapNotFound if provided snap