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

cleanup: rename rbdSnapshot.SnapID to VolID

Browse Source 
The rbdSnapshot and rbdVolume structs have many common attributes. In
order to combine these into an rbdImage struct that implements shared
functionality, having the same attribute for the ID makes things much
easier.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2021-03-12 13:50:07 +01:00 committed by mergify[bot]
parent 22ee7c0de5
commit 3fe714c4fa
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/rbd/controllerserver.go
View File

@ -467,13 +467,13 @@ func (cs *ControllerServer) createBackingImage(ctx context.Context, cr *util.Cre
switch { switch {
case rbdSnap != nil: case rbdSnap != nil:
if err = cs.OperationLocks.GetRestoreLock(rbdSnap.SnapID); err != nil { if err = cs.OperationLocks.GetRestoreLock(rbdSnap.VolID); err != nil {
util.ErrorLog(ctx, err.Error()) util.ErrorLog(ctx, err.Error())
return status.Error(codes.Aborted, err.Error()) return status.Error(codes.Aborted, err.Error())
} }
defer cs.OperationLocks.ReleaseRestoreLock(rbdSnap.SnapID) defer cs.OperationLocks.ReleaseRestoreLock(rbdSnap.VolID)
err = cs.createVolumeFromSnapshot(ctx, cr, rbdVol, rbdSnap.SnapID) err = cs.createVolumeFromSnapshot(ctx, cr, rbdVol, rbdSnap.VolID)
if err != nil { if err != nil {
return err return err
} }
@ -813,7 +813,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
return &csi.CreateSnapshotResponse{ return &csi.CreateSnapshotResponse{
Snapshot: &csi.Snapshot{ Snapshot: &csi.Snapshot{
SizeBytes: rbdSnap.SizeBytes, SizeBytes: rbdSnap.SizeBytes,
SnapshotId: rbdSnap.SnapID, SnapshotId: rbdSnap.VolID,
SourceVolumeId: rbdSnap.SourceVolumeID, SourceVolumeId: rbdSnap.SourceVolumeID,
CreationTime: rbdSnap.CreatedAt, CreationTime: rbdSnap.CreatedAt,
ReadyToUse: false, ReadyToUse: false,
@ -831,7 +831,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
return &csi.CreateSnapshotResponse{ return &csi.CreateSnapshotResponse{
Snapshot: &csi.Snapshot{ Snapshot: &csi.Snapshot{
SizeBytes: rbdSnap.SizeBytes, SizeBytes: rbdSnap.SizeBytes,
SnapshotId: rbdSnap.SnapID, SnapshotId: rbdSnap.VolID,
SourceVolumeId: rbdSnap.SourceVolumeID, SourceVolumeId: rbdSnap.SourceVolumeID,
CreationTime: rbdSnap.CreatedAt, CreationTime: rbdSnap.CreatedAt,
ReadyToUse: true, ReadyToUse: true,

8
internal/rbd/rbd_journal.go
View File

@ -171,7 +171,7 @@ func checkSnapCloneExists(ctx context.Context, parentVol *rbdVolume, rbdSnap *rb
rbdSnap.CreatedAt = vol.CreatedAt rbdSnap.CreatedAt = vol.CreatedAt
rbdSnap.SizeBytes = vol.VolSize rbdSnap.SizeBytes = vol.VolSize
// found a snapshot already available, process and return its information // found a snapshot already available, process and return its information
rbdSnap.SnapID, err = util.GenerateVolID(ctx, rbdSnap.Monitors, cr, snapData.ImagePoolID, rbdSnap.Pool, rbdSnap.VolID, err = util.GenerateVolID(ctx, rbdSnap.Monitors, cr, snapData.ImagePoolID, rbdSnap.Pool,
rbdSnap.ClusterID, snapUUID, volIDVersion) rbdSnap.ClusterID, snapUUID, volIDVersion)
if err != nil { if err != nil {
return false, err return false, err
@ -208,7 +208,7 @@ func checkSnapCloneExists(ctx context.Context, parentVol *rbdVolume, rbdSnap *rb
} }
util.DebugLog(ctx, "found existing image (%s) with name (%s) for request (%s)", util.DebugLog(ctx, "found existing image (%s) with name (%s) for request (%s)",
rbdSnap.SnapID, rbdSnap.RbdSnapName, rbdSnap.RequestName) rbdSnap.VolID, rbdSnap.RbdSnapName, rbdSnap.RequestName)
return true, nil return true, nil
} }
@ -349,14 +349,14 @@ func reserveSnap(ctx context.Context, rbdSnap *rbdSnapshot, rbdVol *rbdVolume, c
return err return err
} }
rbdSnap.SnapID, err = util.GenerateVolID(ctx, rbdSnap.Monitors, cr, imagePoolID, rbdSnap.Pool, rbdSnap.VolID, err = util.GenerateVolID(ctx, rbdSnap.Monitors, cr, imagePoolID, rbdSnap.Pool,
rbdSnap.ClusterID, rbdSnap.ReservedID, volIDVersion) rbdSnap.ClusterID, rbdSnap.ReservedID, volIDVersion)
if err != nil { if err != nil {
return err return err
} }
util.DebugLog(ctx, "generated Volume ID (%s) and image name (%s) for request name (%s)", util.DebugLog(ctx, "generated Volume ID (%s) and image name (%s) for request name (%s)",
rbdSnap.SnapID, rbdSnap.RbdSnapName, rbdSnap.RequestName) rbdSnap.VolID, rbdSnap.RbdSnapName, rbdSnap.RequestName)
return nil return nil
} }

10
internal/rbd/rbd_util.go
View File

@ -116,7 +116,7 @@ type rbdSnapshot struct {
// SourceVolumeID is the volume ID of RbdImageName, that is exchanged with CSI drivers // SourceVolumeID is the volume ID of RbdImageName, that is exchanged with CSI drivers
// RbdImageName is the name of the RBD image, that is this rbdSnapshot's source image // RbdImageName is the name of the RBD image, that is this rbdSnapshot's source image
// RbdSnapName is the name of the RBD snapshot backing this rbdSnapshot // RbdSnapName is the name of the RBD snapshot backing this rbdSnapshot
// SnapID is the snapshot ID that is exchanged with CSI drivers, identifying this rbdSnapshot // VolID is the snapshot ID that is exchanged with CSI drivers, identifying this rbdSnapshot
// RequestName is the CSI generated snapshot name for the rbdSnapshot // RequestName is the CSI generated snapshot name for the rbdSnapshot
// JournalPool is the ceph pool in which the CSI snapshot Journal is stored // JournalPool is the ceph pool in which the CSI snapshot Journal is stored
// Pool is where the image snapshot journal and snapshot is stored, and could be the same as `JournalPool` // Pool is where the image snapshot journal and snapshot is stored, and could be the same as `JournalPool`
@ -126,7 +126,7 @@ type rbdSnapshot struct {
ReservedID string ReservedID string
NamePrefix string NamePrefix string
RbdSnapName string RbdSnapName string
SnapID string VolID string
ImageID string ImageID string
Monitors string Monitors string
JournalPool string JournalPool string
@ -696,11 +696,11 @@ func genSnapFromSnapID(ctx context.Context, rbdSnap *rbdSnapshot, snapshotID str
) )
options = make(map[string]string) options = make(map[string]string)
rbdSnap.SnapID = snapshotID rbdSnap.VolID = snapshotID
err := vi.DecomposeCSIID(rbdSnap.SnapID) err := vi.DecomposeCSIID(rbdSnap.VolID)
if err != nil { if err != nil {
util.ErrorLog(ctx, "error decoding snapshot ID (%s) (%s)", err, rbdSnap.SnapID) util.ErrorLog(ctx, "error decoding snapshot ID (%s) (%s)", err, rbdSnap.VolID)
return err return err
} }

2
internal/rbd/snapshot.go
View File

@ -82,7 +82,7 @@ func cleanUpSnapshot(ctx context.Context, parentVol *rbdVolume, rbdSnap *rbdSnap
func generateVolFromSnap(rbdSnap *rbdSnapshot) *rbdVolume { func generateVolFromSnap(rbdSnap *rbdSnapshot) *rbdVolume {
vol := new(rbdVolume) vol := new(rbdVolume)
vol.ClusterID = rbdSnap.ClusterID vol.ClusterID = rbdSnap.ClusterID
vol.VolID = rbdSnap.SnapID vol.VolID = rbdSnap.VolID
vol.Monitors = rbdSnap.Monitors vol.Monitors = rbdSnap.Monitors
vol.Pool = rbdSnap.Pool vol.Pool = rbdSnap.Pool
vol.JournalPool = rbdSnap.JournalPool vol.JournalPool = rbdSnap.JournalPool