Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blobfuse2: set max memory cache for streaming #1297

Merged
merged 4 commits into from
Feb 24, 2025
Merged

blobfuse2: set max memory cache for streaming #1297

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a7becd
blobfuse2: use correct flag for max memory cache for streaming and se…
nilsgstrabo Feb 24, 2025
928d3ba
update chart version
nilsgstrabo Feb 24, 2025
ef82ab3
use literal string for streaming flag
nilsgstrabo Feb 24, 2025
7b76ab6
remove commented code
nilsgstrabo Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/radix-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: radix-operator
version: 1.52.2
appVersion: 1.72.2
version: 1.52.3
appVersion: 1.72.3
kubeVersion: ">=1.24.0"
description: Radix Operator
keywords:
Expand Down
12 changes: 3 additions & 9 deletions pkg/apis/volumemount/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,9 @@ const (
csiPersistentVolumeClaimNameTemplate = "pvc-%s-%s" // pvc-<volumename>-<randomstring5>
csiPersistentVolumeNameTemplate = "pv-radixvolumemount-%s" // pv-<guid>

csiMountOptionGid = "gid" // Volume mount owner GroupID. Used when drivers do not honor fsGroup securityContext setting
csiMountOptionUid = "uid" // Volume mount owner UserID. Used instead of GroupID
csiMountOptionUseAdls = "use-adls" // Use ADLS or Block Blob
csiMountOptionStreamingEnabled = "streaming" // Enable Streaming
csiMountOptionStreamingCache = "stream-cache-mb" // Limit total amount of data being cached in memory to conserve memory
csiMountOptionStreamingMaxBlocksPerFile = "max-blocks-per-file" // Maximum number of blocks to be cached in memory for streaming
csiMountOptionStreamingMaxBuffers = "max-buffers" // The total number of buffers to be cached in memory (in MB).
csiMountOptionStreamingBlockSize = "block-size-mb" // The size of each block to be cached in memory (in MB).
csiMountOptionStreamingBufferSize = "buffer-size-mb" // The size of each buffer to be cached in memory (in MB).
csiMountOptionGid = "gid" // Volume mount owner GroupID. Used when drivers do not honor fsGroup securityContext setting
csiMountOptionUid = "uid" // Volume mount owner UserID. Used instead of GroupID
csiMountOptionUseAdls = "use-adls" // Use ADLS or Block Blob

csiVolumeAttributeProtocolParameterFuse = "fuse" // Protocol "blobfuse"
csiVolumeAttributeProtocolParameterFuse2 = "fuse2" // Protocol "blobfuse2"
Expand Down
38 changes: 19 additions & 19 deletions pkg/apis/volumemount/volumemount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,25 +620,25 @@ func getStreamingMountOptions(streaming *radixv1.RadixVolumeMountStreaming) []st
if streaming != nil && streaming.Enabled != nil && !*streaming.Enabled {
return nil
}
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%t", csiMountOptionStreamingEnabled, true))
if streaming == nil {
return mountOptions
}
if streaming.StreamCache != nil {
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingCache, *streaming.StreamCache))
}
if streaming.BlockSize != nil {
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingBlockSize, *streaming.BlockSize))
}
if streaming.BufferSize != nil {
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingBufferSize, *streaming.BufferSize))
}
if streaming.MaxBuffers != nil {
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingMaxBuffers, *streaming.MaxBuffers))
}
if streaming.MaxBlocksPerFile != nil {
mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingMaxBlocksPerFile, *streaming.MaxBlocksPerFile))
}
mountOptions = append(mountOptions, "--streaming=true")

var streamCache uint64 = 250
if streaming != nil && streaming.StreamCache != nil {
streamCache = *streaming.StreamCache
}
mountOptions = append(mountOptions, fmt.Sprintf("--block-cache-pool-size=%v", streamCache))
// if streaming.BlockSize != nil {
// mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingBlockSize, *streaming.BlockSize))
// }
// if streaming.BufferSize != nil {
// mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingBufferSize, *streaming.BufferSize))
// }
// if streaming.MaxBuffers != nil {
// mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingMaxBuffers, *streaming.MaxBuffers))
// }
// if streaming.MaxBlocksPerFile != nil {
// mountOptions = append(mountOptions, fmt.Sprintf("--%s=%v", csiMountOptionStreamingMaxBlocksPerFile, *streaming.MaxBlocksPerFile))
// }
return mountOptions
}

Expand Down
15 changes: 8 additions & 7 deletions pkg/apis/volumemount/volumemount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ func (s *volumeMountTestSuite) Test_CreateOrUpdateCsiAzureResources() {
existingPvs: []corev1.PersistentVolume{},
expectedPvs: []corev1.PersistentVolume{
createExpectedPv(props, func(pv *corev1.PersistentVolume) {
pv.Spec.MountOptions = getMountOptions(props, "--streaming=true", "--use-adls=false")
pv.Spec.MountOptions = getMountOptions(props, "--streaming=true", "--block-cache-pool-size=250", "--use-adls=false")
}),
},
}
Expand Down Expand Up @@ -715,12 +715,13 @@ func (s *volumeMountTestSuite) Test_CreateOrUpdateCsiAzureResources() {
createExpectedPv(props, func(pv *corev1.PersistentVolume) {
pv.Spec.MountOptions = getMountOptions(props,
"--streaming=true",
"--stream-cache-mb=101",
"--block-size-mb=102",
"--buffer-size-mb=103",
"--max-buffers=104",
"--max-blocks-per-file=105",
"--use-adls=false")
"--block-cache-pool-size=101",
// "--block-size-mb=102",
// "--buffer-size-mb=103",
// "--max-buffers=104",
// "--max-blocks-per-file=105",
"--use-adls=false",
)
}),
},
}
Expand Down
Loading