rbd: use volumeattributesclass feature implement rbd volume qos by YiteGu · Pull Request #6160 · ceph/ceph-csi

YiteGu · 2026-03-06T09:34:06Z

Describe what this PR does

The solution using storageclass to implement RBD volume QoS has been cancelled because the storageclass parameters cannot be modified. The volumeattributesclass solution is more flexible because it supports mutable parameters.
Add the new parameter: volumeAttributesClassName when defining the PVC. For example:

apiVersion: v1
kind: PersistentVolumeClaim
metadata:
  name: vac-pvc-1
  namespace: rook-ceph
spec:
  accessModes:
  - ReadWriteOnce
  resources:
    requests:
      storage: 30Gi
  storageClassName: rook-ceph-block
  volumeMode: Block
  volumeAttributesClassName: silver

Implemented the ControllerModifyVolume interface. Users can upgrade their QoS by modifying the volumeAttributesClassName parameter of an existing PVC.

ref: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/

Is there anything that requires special attention

Do you have any questions?

Is the change backward compatible?

Are there concerns around backward compatibility?

Provide any external context for the change, if any.

For example:

Kubernetes links that explain why the change is required
CSI spec related changes/catch-up that necessitates this patch
golang related practices that necessitates this change

Related issues

Mention any github issues relevant to this PR. Adding below line
will help to auto close the issue once the PR is merged.

Fixes: #issue_number

Future concerns

List items that are not part of the PR and do not impact it's
functionality, but are work items that can be taken up subsequently.

Checklist:

Commit Message Formatting: Commit titles and messages follow
guidelines in the developer
guide.
Reviewed the developer guide on Submitting a Pull
Request
Pending release
notes
updated with breaking and/or notable changes for the next major release.
Documentation has been updated, if necessary.
Unit tests have been added, if necessary.
Integration tests have been added, if necessary.

Show available bot commands

These commands are normally not required, but in case of issues, leave any of
the following bot commands in an otherwise empty comment in this PR:

/retest ci/centos/<job-name>: retest the <job-name> after unrelated
failure (please report the failure too!)

nixpanic

This is a user visible change. Put a note in PendingReleaseNotes.md for this too. Maybe add a note in the main README.md for support of this as well, update other documentation?

mergify · 2026-03-10T16:43:22Z

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

mergify · 2026-03-11T05:14:21Z

This pull request now has conflicts with the target branch. Could you please resolve conflicts and force push the corrected changes? 🙏

nixpanic

Two minor things that caught the eye of Claude Code, and look like good recommendations to me.

YiteGu · 2026-03-11T11:21:33Z

/test ci/centos/mini-e2e/k8s-1.34

nixpanic

Another round of review (now completed by me, not Claude).

These are the only changes I would like to see, everything else looks good to me. Thanks!

nixpanic

Thanks, looks good to me.

Signed-off-by: Yite Gu <[email protected]>

Add getCephCSIVersion() that runs "cephcsi -version" in a nodeplugin container and returns the major and minor version numbers. Development builds that report "canary" as the version return math.MaxInt for both so they always compare as newer than any specific release. Add cephcsiVersionGreaterEquals() that wraps getCephCSIVersion() and returns true when the running version is equal to or newer than the requested major.minor version. On failure the test case is marked as FAILED, matching the behaviour of k8sVersionGreaterEquals(). Assisted-by: Claude Code <[email protected]> Signed-off-by: Niels de Vos <[email protected]>

Remove the unconditional setting of controller-modify-secret in createRBDStorageClass() and move it into the VolumeAttributesClass test, where it is actually needed for ControllerModifyVolume calls. Add supportsVolumeAttributesClass() to combine the Kubernetes (>= 1.34) and ceph-csi (>= 3.17) version checks into a single helper. The VAC QoS test uses it as its sole guard condition. When the check passes, the test recreates the default StorageClass with the controller-modify-secret parameters before exercising modify operations, and restores the plain StorageClass afterwards so subsequent tests are not affected. Assisted-by: Claude Code <[email protected]> Signed-off-by: Niels de Vos <[email protected]>

mergify · 2026-04-09T10:42:35Z

rebase

✅ Branch has been successfully rebased

ceph-csi-bot · 2026-04-09T10:42:43Z

/test ci/centos/k8s-e2e-external-storage/1.33

ceph-csi-bot · 2026-04-09T10:42:43Z

/test ci/centos/k8s-e2e-external-storage/1.34

ceph-csi-bot · 2026-04-09T10:42:43Z

/test ci/centos/mini-e2e-helm/k8s-1.33

ceph-csi-bot · 2026-04-09T10:42:44Z

/test ci/centos/mini-e2e-helm/k8s-1.34

ceph-csi-bot · 2026-04-09T10:42:44Z

/test ci/centos/mini-e2e/k8s-1.33

ceph-csi-bot · 2026-04-09T10:42:44Z

/test ci/centos/mini-e2e/k8s-1.34

ceph-csi-bot · 2026-04-09T10:42:45Z

/test ci/centos/k8s-e2e-external-storage/1.35

ceph-csi-bot · 2026-04-09T10:42:45Z

/test ci/centos/upgrade-tests-cephfs

ceph-csi-bot · 2026-04-09T10:42:46Z

/test ci/centos/mini-e2e-helm/k8s-1.35

ceph-csi-bot · 2026-04-09T10:42:46Z

/test ci/centos/upgrade-tests-rbd

ceph-csi-bot · 2026-04-09T10:42:46Z

/test ci/centos/mini-e2e/k8s-1.35

mergify · 2026-04-09T13:46:51Z

Deprecation notice: This pull request comes from a fork and was queued with update_method=rebase and update_bot_account impersonation. This capability will be removed on July 1, 2026. After this date, the merge queue will no longer be able to rebase fork pull requests with this configuration. To avoid disruption, switch to update_method=merge in your queue rule.

mergify · 2026-04-09T13:47:00Z

Merge Queue Status

✅ Entered queue — 2026-04-09 13:46 UTC · Rule: default
✅ Checks skipped · PR is already up-to-date
✅ Merged — 2026-04-09 13:47 UTC · at 64998fa60d98c0ba560118c4d4b056ced7f11feb

This pull request spent 23 seconds in the queue, including 3 seconds running CI.

Required conditions to merge

#approved-reviews-by >= 2 [🛡 GitHub branch protection]
- rbd: use volumeattributesclass feature implement rbd volume qos #6160
#changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
- rbd: use volumeattributesclass feature implement rbd volume qos #6160

mergify Bot added the component/rbd Issues related to RBD label Mar 6, 2026

YiteGu force-pushed the support-vac-feature-for-rbd branch 3 times, most recently from b78efe5 to 36c1c2f Compare March 6, 2026 11:43

YiteGu mentioned this pull request Mar 6, 2026

Use MutableParameters for NBD QOS in CreateVolume #5750

Closed

YiteGu force-pushed the support-vac-feature-for-rbd branch 4 times, most recently from c1e4f0a to dffa21e Compare March 9, 2026 13:41

nixpanic reviewed Mar 10, 2026

View reviewed changes

Comment thread internal/rbd/controllerserver.go Outdated

Comment thread internal/rbd/controllerserver.go

Comment thread e2e/rbd.go Outdated

Comment thread internal/util/idlocker.go

YiteGu force-pushed the support-vac-feature-for-rbd branch 3 times, most recently from cb885ba to a8df95a Compare March 11, 2026 05:13

YiteGu force-pushed the support-vac-feature-for-rbd branch 2 times, most recently from 43fa44e to 1a4ade8 Compare March 11, 2026 06:25

YiteGu requested a review from nixpanic March 11, 2026 07:36

YiteGu force-pushed the support-vac-feature-for-rbd branch from f7b6685 to e786b28 Compare March 11, 2026 07:44

nixpanic reviewed Mar 11, 2026

View reviewed changes

Comment thread internal/rbd/controllerserver.go Outdated

Comment thread examples/rbd/storageclass.yaml

YiteGu force-pushed the support-vac-feature-for-rbd branch from e786b28 to 650a107 Compare March 11, 2026 11:46

nixpanic reviewed Mar 11, 2026

View reviewed changes

Comment thread PendingReleaseNotes.md Outdated

Comment thread README.md Outdated

Comment thread docs/volumeattributesclass.md Outdated

YiteGu force-pushed the support-vac-feature-for-rbd branch 2 times, most recently from b2d68cb to a79ce62 Compare March 16, 2026 02:52

YiteGu requested a review from nixpanic March 16, 2026 03:34

nixpanic approved these changes Mar 16, 2026

View reviewed changes

nixpanic requested a review from a team March 16, 2026 09:05

nixpanic added the enhancement New feature or request label Mar 16, 2026

nixpanic requested changes Mar 16, 2026

View reviewed changes

Comment thread internal/rbd/controllerserver.go

YiteGu and others added 8 commits April 9, 2026 10:42

doc: update README.md for rbd volumeattributesclass feature

c6bd92b

Signed-off-by: Yite Gu <[email protected]>

doc: update how use volumeattributesclass for rbd volume qos

79f4e1f

Signed-off-by: Yite Gu <[email protected]>

rbd: set controller-modify-secret in SC parameters

17121b4

Signed-off-by: Yite Gu <[email protected]>

deploy: update csi-provisioner image to v6.2.0

d812b0d

Signed-off-by: Yite Gu <[email protected]>

deploy: add volumeattributesclasses permissions for csi-provisioner

e750463

Signed-off-by: Yite Gu <[email protected]>

deploy: add RBAC for csi-provisioner to access volumeattributesclass

f30491c

Signed-off-by: Yite Gu <[email protected]>

ceph-csi-bot force-pushed the support-vac-feature-for-rbd branch from b18b694 to 64998fa Compare April 9, 2026 10:42

nixpanic added the ok-to-test Label to trigger E2E tests label Apr 9, 2026

ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Apr 9, 2026

nixpanic mentioned this pull request Apr 9, 2026

nvmeof: Add GroupLock to coordinate stage and unstage operations and e2e tests #6210

Merged

6 tasks

nixpanic added the ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. label Apr 9, 2026

mergify Bot added the queued label Apr 9, 2026

mergify Bot merged commit 5899eb9 into ceph:devel Apr 9, 2026
44 checks passed

mergify Bot removed the queued label Apr 9, 2026

Conversation

YiteGu commented Mar 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Describe what this PR does

Is there anything that requires special attention

Related issues

Future concerns

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mergify Bot commented Mar 10, 2026

Uh oh!

mergify Bot commented Mar 11, 2026

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

YiteGu commented Mar 11, 2026

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mergify Bot commented Apr 9, 2026

✅ Branch has been successfully rebased

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

ceph-csi-bot commented Apr 9, 2026

Uh oh!

mergify Bot commented Apr 9, 2026

Uh oh!

mergify Bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Queue Status

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

YiteGu commented Mar 6, 2026 •

edited

Loading

mergify Bot commented Apr 9, 2026 •

edited

Loading