mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 02:43:36 +00:00
rbd: set SnapshotGroupID on each Snapshot of a VolumeGroupSnapshot
Without the SnapshotGroupID in the Snapshot object, Kubernetes CSI does not know that the Snapshot belongs to a group. In that case, it allows the deletion of the Snapshot, which should be denied. Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
committed by
mergify[bot]
parent
ec1e7a4ee0
commit
cea8bf8110
@ -153,11 +153,12 @@ func (rbdSnap *rbdSnapshot) ToCSI(ctx context.Context) (*csi.Snapshot, error) {
|
||||
}
|
||||
|
||||
return &csi.Snapshot{
|
||||
SizeBytes: rbdSnap.VolSize,
|
||||
SnapshotId: rbdSnap.VolID,
|
||||
SourceVolumeId: rbdSnap.SourceVolumeID,
|
||||
CreationTime: timestamppb.New(*created),
|
||||
ReadyToUse: true,
|
||||
SizeBytes: rbdSnap.VolSize,
|
||||
SnapshotId: rbdSnap.VolID,
|
||||
SourceVolumeId: rbdSnap.SourceVolumeID,
|
||||
CreationTime: timestamppb.New(*created),
|
||||
ReadyToUse: true,
|
||||
GroupSnapshotId: rbdSnap.groupID,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@ -315,3 +316,26 @@ func (rv *rbdVolume) NewSnapshotByID(
|
||||
|
||||
return snap, nil
|
||||
}
|
||||
|
||||
func (rbdSnap *rbdSnapshot) SetVolumeGroup(ctx context.Context, cr *util.Credentials, groupID string) error {
|
||||
vi := util.CSIIdentifier{}
|
||||
err := vi.DecomposeCSIID(rbdSnap.VolID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
j, err := snapJournal.Connect(rbdSnap.Monitors, rbdSnap.RadosNamespace, cr)
|
||||
if err != nil {
|
||||
return fmt.Errorf("snapshot %q failed to connect to journal: %w", rbdSnap, err)
|
||||
}
|
||||
defer j.Destroy()
|
||||
|
||||
err = j.StoreGroupID(ctx, rbdSnap.Pool, vi.ObjectUUID, groupID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to set volume group ID for snapshot %q: %w", rbdSnap, err)
|
||||
}
|
||||
|
||||
rbdSnap.groupID = groupID
|
||||
|
||||
return nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user