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

journal: support removing multiple volumeID

Browse Source 
Updating the code to support removing
multiple volumeID's mapping from the
group journal.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit is contained in:
Madhu Rajanna 2024-06-18 11:14:37 +02:00 committed by mergify[bot]
parent f346f3d201
commit fc0a7d2542
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cephfs/groupcontrollerserver.go
View File

@ -644,7 +644,7 @@ func (cs *ControllerServer) deleteSnapshotsAndUndoReservation(ctx context.Contex
ctx, ctx,
vgo.MetadataPool, vgo.MetadataPool,
vgsi.ReservedID, vgsi.ReservedID,
volID) []string{volID})
j.Destroy() j.Destroy()
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed to remove volume snapshot mapping: %v", err) log.ErrorLog(ctx, "failed to remove volume snapshot mapping: %v", err)

14
internal/journal/volumegroupjournal.go
View File

@ -64,12 +64,12 @@ type VolumeGroupJournal interface {
reservedUUID, reservedUUID,
volumeID, volumeID,
value string) error value string) error
// RemoveVolumeMapping removes a volumeID mapping from the UUID directory. // RemoveVolumeMapping removes volumeIDs mapping from the UUID directory.
RemoveVolumeMapping( RemoveVolumeMapping(
ctx context.Context, ctx context.Context,
pool, pool,
reservedUUID, reservedUUID string,
volumeID string) error volumeIDs []string) error
} }
// VolumeGroupJournalConfig contains the configuration. // VolumeGroupJournalConfig contains the configuration.
@ -424,14 +424,14 @@ func (vgjc *VolumeGroupJournalConnection) AddVolumeMapping(
func (vgjc *VolumeGroupJournalConnection) RemoveVolumeMapping( func (vgjc *VolumeGroupJournalConnection) RemoveVolumeMapping(
ctx context.Context, ctx context.Context,
pool, pool,
reservedUUID, reservedUUID string,
volumeID string, volumeIDs []string,
) error { ) error {
err := removeMapKeys(ctx, vgjc.connection, pool, vgjc.config.namespace, err := removeMapKeys(ctx, vgjc.connection, pool, vgjc.config.namespace,
vgjc.config.cephUUIDDirectoryPrefix+reservedUUID, vgjc.config.cephUUIDDirectoryPrefix+reservedUUID,
[]string{volumeID}) volumeIDs)
if err != nil { if err != nil {
log.ErrorLog(ctx, "failed removing volume mapping from group: key %q: %v", volumeID, err) log.ErrorLog(ctx, "failed removing volume mapping from group: key: %q %v", volumeIDs, err)
return err return err
} }