mirror of
https://github.com/ceph/ceph-csi.git
synced 2024-09-19 15:09:56 +00:00
journal: pass groupUUID to be used for omap name reserve
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>
This commit is contained in:
parent
ede36cfd95
commit
c4a1060a64
@ -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
|
||||
}
|
||||
|
@ -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
|
||||
@ -309,6 +310,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 RBD mirroring)
|
||||
- namePrefix: Prefix to use when generating the volumeGroupName name (suffix is an auto-generated UUID)
|
||||
|
||||
Return values:
|
||||
@ -317,7 +319,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
|
||||
|
||||
@ -332,7 +334,7 @@ func (vgjc *volumeGroupJournalConnection) ReserveName(ctx context.Context,
|
||||
journalPool,
|
||||
cj.namespace,
|
||||
cj.cephUUIDDirectoryPrefix,
|
||||
"")
|
||||
groupUUID)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user