mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2025-06-13 10:33:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: do not pass EncodingVersion to GenerateVolID()

Browse Source 
The only encoding version that exists is `1`. There is no need to have
multiple constants for that version across different packages. Because
there is only one version, `GenerateVolID()` does not really require it,
and it can use a default version.

If there is a need in the future to support an other encoding version,
this can be revisited with a cleaner solution.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2024-03-14 10:40:49 +01:00
committed by mergify[bot]
parent c32dfc0ae6
commit 991343d9e5
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/cephfs/store/fsjournal.go
View File

@ -192,7 +192,7 @@ func CheckVolExists(ctx context.Context,
// found a volume already available, process and return it!
vid.VolumeID, err = util.GenerateVolID(ctx, volOptions.Monitors, cr, volOptions.FscID,
"", volOptions.ClusterID, imageUUID, fsutil.VolIDVersion)
"", volOptions.ClusterID, imageUUID)
if err != nil {
return nil, err
}
@ -299,7 +299,7 @@ func ReserveVol(ctx context.Context, volOptions *VolumeOptions, secret map[strin
volOptions.VolID = vid.FsSubvolName
// generate the volume ID to return to the CO system
vid.VolumeID, err = util.GenerateVolID(ctx, volOptions.Monitors, cr, volOptions.FscID,
"", volOptions.ClusterID, imageUUID, fsutil.VolIDVersion)
"", volOptions.ClusterID, imageUUID)
if err != nil {
return nil, err
}
@ -345,7 +345,7 @@ func ReserveSnap(
// generate the snapshot ID to return to the CO system
vid.SnapshotID, err = util.GenerateVolID(ctx, volOptions.Monitors, cr, volOptions.FscID,
"", volOptions.ClusterID, imageUUID, fsutil.VolIDVersion)
"", volOptions.ClusterID, imageUUID)
if err != nil {
return nil, err
}
@ -453,7 +453,7 @@ func CheckSnapExists(
// found a snapshot already available, process and return it!
sid.SnapshotID, err = util.GenerateVolID(ctx, volOptions.Monitors, cr, volOptions.FscID,
"", volOptions.ClusterID, snapUUID, fsutil.VolIDVersion)
"", volOptions.ClusterID, snapUUID)
if err != nil {
return nil, err
}