Skip to content

Commit

Permalink
journal: pass groupUUID to be used for omap name reserve
Browse files Browse the repository at this point in the history
This commit adds groupUUID param for `ReserveName` to be used for
OMAP name reserve instead of auto-generating.
This is useful for mirroring and metro-DR ensuring that mirrored
resources have consistent OMAP names across mirrored clusters.

Signed-off-by: Praveen M <m.praveen@ibm.com>
  • Loading branch information
iPraveenParihar committed Aug 14, 2024
1 parent d02a6ec commit f31b05f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion internal/cephfs/store/volumegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ func ReserveVolumeGroup(
defer j.Destroy()

groupUUID, vgsi.FsVolumeGroupSnapshotName, err = j.ReserveName(
ctx, volOptions.MetadataPool, volOptions.RequestName, volOptions.NamePrefix)
ctx, volOptions.MetadataPool, volOptions.RequestName, volOptions.ReservedID, volOptions.NamePrefix)
if err != nil {
return nil, err
}
Expand Down
6 changes: 4 additions & 2 deletions internal/journal/volumegroupjournal.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type VolumeGroupJournal interface {
ctx context.Context,
journalPool,
reqName,
groupUUID,
namePrefix string) (string, string, error)
// AddVolumesMapping adds a volumeMap map which contains volumeID's and its
// corresponding values mapping which need to be added to the UUID
Expand Down Expand Up @@ -308,6 +309,7 @@ held, to prevent parallel operations from modifying the state of the omaps for t
Input arguments:
- journalPool: Pool where the CSI journal is stored
- reqName: Name of the volumeGroupSnapshot request received
- groupUUID: UUID need to be reserved instead of auto-generating one (this is useful for mirroring and metro-DR)
- namePrefix: Prefix to use when generating the volumeGroupName name (suffix is an auto-generated UUID)
Return values:
Expand All @@ -316,7 +318,7 @@ Return values:
- error: non-nil in case of any errors
*/
func (vgjc *volumeGroupJournalConnection) ReserveName(ctx context.Context,
journalPool, reqName, namePrefix string,
journalPool, reqName, groupUUID, namePrefix string,
) (string, string, error) {
cj := vgjc.config

Expand All @@ -331,7 +333,7 @@ func (vgjc *volumeGroupJournalConnection) ReserveName(ctx context.Context,
journalPool,
cj.namespace,
cj.cephUUIDDirectoryPrefix,
"")
groupUUID)
if err != nil {
return "", "", err
}
Expand Down
2 changes: 1 addition & 1 deletion internal/rbd/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func (mgr *rbdManager) CreateVolumeGroup(ctx context.Context, name string) (type
log.DebugLog(ctx, "the journal does not contain a reservation for a volume group with name %q yet", name)

var vgName string
uuid, vgName, err = vgJournal.ReserveName(ctx, journalPool, name, prefix)
uuid, vgName, err = vgJournal.ReserveName(ctx, journalPool, name, vgData.GroupUUID, prefix)
if err != nil {
return nil, fmt.Errorf("failed to reserve volume group for name %q: %w", name, err)
}
Expand Down

0 comments on commit f31b05f

Please sign in to comment.