mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-09 16:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: remove unused parameter journalPoolID from ReserveName()

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2024-03-19 18:36:17 +01:00 committed by mergify[bot]
parent 3aece2f38e
commit 6b5ef1d76a
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cephfs/store/volumegroup.go
View File

@ -245,7 +245,7 @@ func ReserveVolumeGroup(
defer j.Destroy() defer j.Destroy()
groupUUID, vgsi.FsVolumeGroupSnapshotName, err = j.ReserveName( groupUUID, vgsi.FsVolumeGroupSnapshotName, err = j.ReserveName(
ctx, volOptions.MetadataPool, util.InvalidPoolID, volOptions.RequestName, volOptions.NamePrefix) ctx, volOptions.MetadataPool, volOptions.RequestName, volOptions.NamePrefix)
if err != nil { if err != nil {
return nil, err return nil, err
} }

7
internal/journal/volumegroupjournal.go
View File

@ -51,8 +51,7 @@ type VolumeGroupJournal interface {
objectUUID string) (*VolumeGroupAttributes, error) objectUUID string) (*VolumeGroupAttributes, error)
ReserveName( ReserveName(
ctx context.Context, ctx context.Context,
journalPool string, journalPool,
journalPoolID int64,
reqName, reqName,
namePrefix string) (string, string, error) namePrefix string) (string, string, error)
// AddVolumesMapping adds a volumeMap map which contains volumeID's and its // AddVolumesMapping adds a volumeMap map which contains volumeID's and its
@ -296,7 +295,6 @@ held, to prevent parallel operations from modifying the state of the omaps for t
Input arguments: Input arguments:
- journalPool: Pool where the CSI journal is stored - journalPool: Pool where the CSI journal is stored
- journalPoolID: pool ID of the journalPool
- reqName: Name of the volumeGroupSnapshot request received - reqName: Name of the volumeGroupSnapshot request received
- namePrefix: Prefix to use when generating the volumeGroupName name (suffix is an auto-generated UUID) - namePrefix: Prefix to use when generating the volumeGroupName name (suffix is an auto-generated UUID)
@ -306,8 +304,7 @@ Return values:
- error: non-nil in case of any errors - error: non-nil in case of any errors
*/ */
func (vgjc *VolumeGroupJournalConnection) ReserveName(ctx context.Context, func (vgjc *VolumeGroupJournalConnection) ReserveName(ctx context.Context,
journalPool string, journalPoolID int64, journalPool, reqName, namePrefix string,
reqName, namePrefix string,
) (string, string, error) { ) (string, string, error) {
cj := vgjc.config cj := vgjc.config