diff --git a/internal/cephfs/groupcontrollerserver.go b/internal/cephfs/groupcontrollerserver.go index 1d75709b8..40421517c 100644 --- a/internal/cephfs/groupcontrollerserver.go +++ b/internal/cephfs/groupcontrollerserver.go @@ -644,7 +644,7 @@ func (cs *ControllerServer) deleteSnapshotsAndUndoReservation(ctx context.Contex ctx, vgo.MetadataPool, vgsi.ReservedID, - volID) + []string{volID}) j.Destroy() if err != nil { log.ErrorLog(ctx, "failed to remove volume snapshot mapping: %v", err) diff --git a/internal/journal/volumegroupjournal.go b/internal/journal/volumegroupjournal.go index 5f8f2b3b4..4663731aa 100644 --- a/internal/journal/volumegroupjournal.go +++ b/internal/journal/volumegroupjournal.go @@ -64,12 +64,12 @@ type VolumeGroupJournal interface { reservedUUID, volumeID, value string) error - // RemoveVolumeMapping removes a volumeID mapping from the UUID directory. + // RemoveVolumeMapping removes volumeIDs mapping from the UUID directory. RemoveVolumeMapping( ctx context.Context, pool, - reservedUUID, - volumeID string) error + reservedUUID string, + volumeIDs []string) error } // VolumeGroupJournalConfig contains the configuration. @@ -424,14 +424,14 @@ func (vgjc *VolumeGroupJournalConnection) AddVolumeMapping( func (vgjc *VolumeGroupJournalConnection) RemoveVolumeMapping( ctx context.Context, pool, - reservedUUID, - volumeID string, + reservedUUID string, + volumeIDs []string, ) error { err := removeMapKeys(ctx, vgjc.connection, pool, vgjc.config.namespace, vgjc.config.cephUUIDDirectoryPrefix+reservedUUID, - []string{volumeID}) + volumeIDs) 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 }