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

cephfs: set Pool parameter to empty for Snapshot-backed volumes

Browse Source 
Set VolumeOptions.Pool parameter to empty for Snapshot-backed volumes.
This Pool parameter is optional and  only used as 'pool-layout' parameter
during subvolume and subvolume clone create request in cephcsi
and not used for Snapshot-backed volume at all.
It is not saved anywhere for use in subsequent operations after create too.
Therefore, We can set it to empty and not error out.

Signed-off-by: rakshith-r <rar@redhat.com>
This commit is contained in:
rakshith-r 2023-08-09 16:46:45 +05:30 committed by mergify[bot]
parent f3fca46ac8
commit f1e9d8084a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/cephfs.go
View File

@ -44,6 +44,7 @@ var (
cephFSExamplePath = examplePath + "cephfs/" cephFSExamplePath = examplePath + "cephfs/"
subvolumegroup = "e2e" subvolumegroup = "e2e"
fileSystemName = "myfs" fileSystemName = "myfs"
fileSystemPoolName = "myfs-replicated"
) )
func deployCephfsPlugin() { func deployCephfsPlugin() {
@ -1613,6 +1614,7 @@ var _ = Describe(cephfsType, func() {
scOpts := map[string]string{ scOpts := map[string]string{
"encrypted": "true", "encrypted": "true",
"encryptionKMSID": kmsID, "encryptionKMSID": kmsID,
"pool": fileSystemPoolName,
} }
err = createCephfsStorageClass(f.ClientSet, f, true, scOpts) err = createCephfsStorageClass(f.ClientSet, f, true, scOpts)

7
internal/cephfs/store/volumeoptions.go
View File

@ -542,9 +542,10 @@ func (vo *VolumeOptions) populateVolumeOptionsFromBackingSnapshot(
return fmtBackingSnapshotOptionMismatch("clusterID", vo.ClusterID, parentBackingSnapVolOpts.ClusterID) return fmtBackingSnapshotOptionMismatch("clusterID", vo.ClusterID, parentBackingSnapVolOpts.ClusterID)
} }
if vo.Pool != "" { // Pool parameter is optional and only used to set 'pool_layout' argument for
return errors.New("cannot set pool for snapshot-backed volume") // subvolume and subvolume clone create commands.
} // Setting this to empty since it is not used with Snapshot-backed volume.
vo.Pool = ""
if vo.MetadataPool != parentBackingSnapVolOpts.MetadataPool { if vo.MetadataPool != parentBackingSnapVolOpts.MetadataPool {
return fmtBackingSnapshotOptionMismatch("MetadataPool", vo.MetadataPool, parentBackingSnapVolOpts.MetadataPool) return fmtBackingSnapshotOptionMismatch("MetadataPool", vo.MetadataPool, parentBackingSnapVolOpts.MetadataPool)