Skip to content

cephfs: add controller sidecar for setting CSI metadata on subvolumes#446

Merged
Madhu-1 merged 2 commits intoceph:mainfrom
iPraveenParihar:cephfs/omap-sidecar
Apr 6, 2026
Merged

cephfs: add controller sidecar for setting CSI metadata on subvolumes#446
Madhu-1 merged 2 commits intoceph:mainfrom
iPraveenParihar:cephfs/omap-sidecar

Conversation

@iPraveenParihar
Copy link
Copy Markdown
Contributor

Describe what this PR does

Add the csi-cephfsplugin-controller sidecar container to the CephFS controller plugin deployment,
gated by the GenerateOMapInfo field. This mirrors the upstream ceph-csi change
(ceph/ceph-csi#6174) that adds support for setting CSI metadata (PV/PVC info) on CephFS subvolumes.

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.

Logs

I0327 06:13:06.758935       1 controller.go:303] "Starting Controller" controller="persistentvolume-controller"
I0327 06:13:06.759013       1 controller.go:306] "Starting workers" controller="persistentvolume-controller" worker count=1
I0327 06:13:06.759463       1 controller.go:478] "Reconciling" controller="persistentvolume-controller" namespace="" name="pvc-235b13ba-8f46-4b6a-97af-acc904a0b4a4" reconcileID="a0fd8aff-24ce-4403-9a52-6e09d209de1b"
I0327 06:13:07.241790       1 fsjournal.go:523] cephfs: successfully set metadata on subvolume csi-vol-0527027b-8c79-4029-806b-df91e17b1bfd for PV pvc-235b13ba-8f46-4b6a-97af-acc904a0b4a4
I0327 06:13:07.241941       1 controller.go:510] "Reconcile successful" controller="persistentvolume-controller" namespace="" name="pvc-235b13ba-8f46-4b6a-97af-acc904a0b4a4" reconcileID="a0fd8aff-24ce-4403-9a52-6e09d209de1b"
I0327 06:13:07.242196       1 controller.go:478] "Reconciling" controller="persistentvolume-controller" namespace="" name="pvc-4ef5361e-beb9-488f-88a4-12af4572cf9d" reconcileID="98157b2a-2c80-4354-ad29-9ff70baa57e3"
I0327 06:13:07.485338       1 fsjournal.go:523] cephfs: successfully set metadata on subvolume csi-vol-1d85b0ad-23f6-4923-92bf-e8e675b7aefa for PV pvc-4ef5361e-beb9-488f-88a4-12af4572cf9d
I0327 06:13:07.485768       1 controller.go:510] "Reconcile successful" controller="persistentvolume-controller" namespace="" name="pvc-4ef5361e-beb9-488f-88a4-12af4572cf9d" reconcileID="98157b2a-2c80-4354-ad29-9ff70baa57e3"
I0327 06:13:07.485904       1 controller.go:478] "Reconciling" controller="persistentvolume-controller" namespace="" name="pvc-83e396bb-ef8c-426b-87af-bf211f6dfe4a" reconcileID="f7dbf1a4-d9e7-4419-bfba-e41a595dc3f0"
I0327 06:13:07.879121       1 fsjournal.go:523] cephfs: successfully set metadata on subvolume csi-vol-fdef3e1f-63bf-40b4-8898-b612cd41f4d3 for PV pvc-83e396bb-ef8c-426b-87af-bf211f6dfe4a
I0327 06:13:07.879241       1 controller.go:510] "Reconcile successful" controller="persistentvolume-controller" namespace="" name="pvc-83e396bb-ef8c-426b-87af-bf211f6dfe4a" reconcileID="f7dbf1a4-d9e7-4419-bfba-e41a595dc3f0"
I0327 06:13:07.879484       1 controller.go:478] "Reconciling" controller="persistentvolume-controller" namespace="" name="pvc-84f910d3-3001-4855-8fba-6fe068659890" reconcileID="f9d8a359-16d5-42c2-bd4d-8eef098c243b"
I0327 06:13:08.308569       1 fsjournal.go:523] cephfs: successfully set metadata on subvolume csi-vol-50fffc18-41a6-47c1-9828-b86cc2c2a988 for PV pvc-84f910d3-3001-4855-8fba-6fe068659890
I0327 06:13:08.309198       1 controller.go:510] "Reconcile successful" controller="persistentvolume-controller" namespace="" name="pvc-84f910d3-3001-4855-8fba-6fe068659890" reconcileID="f9d8a359-16d5-42c2-bd4d-8eef098c243b"

Add the csi-cephfsplugin-controller sidecar container to the CephFS
controller plugin deployment, gated by the GenerateOMapInfo field.
This mirrors the upstream ceph-csi change that adds support for
setting CSI metadata (PV/PVC info) on CephFS subvolumes.

Signed-off-by: Praveen M <m.praveen@ibm.com>
@iPraveenParihar iPraveenParihar marked this pull request as ready for review March 27, 2026 06:26
@Madhu-1
Copy link
Copy Markdown
Collaborator

Madhu-1 commented Mar 30, 2026

Will merge this one we have new CSI release to support it

@Madhu-1
Copy link
Copy Markdown
Collaborator

Madhu-1 commented Mar 30, 2026

@iPraveenParihar can you please also update the E2E test yaml to enable this flag to ensure that csi is not crashing

Signed-off-by: Praveen M <m.praveen@ibm.com>
@Madhu-1 Madhu-1 merged commit b0c6c72 into ceph:main Apr 6, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants