e2e: add snapshot test in nvmeof csi by gadididi · Pull Request #6438 · ceph/ceph-csi

gadididi · 2026-07-30T06:41:46Z

Add snapshot test in nvmeof csi e2e test.

the test flow:

Create a source PVC
Create a snapshot of the source PVC
Create a new PVC restored from the snapshot
Delete the restored PVC
Delete the snapshot
Delete the source PVC

Closes: #6435

nixpanic · 2026-08-04T09:27:25Z

/test ci/centos/mini-e2e/k8s-1.37/nvmeof

gadididi · 2026-08-04T11:46:10Z

@nixpanic I see it failed on this test, I will take a look

nixpanic · 2026-08-05T10:34:01Z

@nixpanic I see it failed on this test, I will take a look

I do not see any CreateSnapshot requests in the logs. Maybe the csi-snapshotter sidecar is not part of the controller-plugin Pod?

gadididi · 2026-08-09T13:49:55Z

/test ci/centos/mini-e2e/k8s-1.37/nvmeof

Pull request has been modified.

Copilot

Pull request overview

This PR adds NVMe-oF CSI end-to-end coverage for VolumeSnapshot create/restore workflows, and updates the NVMe-oF provisioner deployment to include the snapshotter sidecar required for snapshot operations.

Changes:

Add NVMe-oF VolumeSnapshotClass create/delete helpers for e2e.
Add a new NVMe-oF e2e test that creates a source PVC, snapshots it, restores a PVC from the snapshot, and validates backend cleanup.
Update the NVMe-oF provisioner Deployment to run csi-snapshotter.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
e2e/snapshot.go	Adds NVMe-oF VolumeSnapshotClass creation/deletion helpers for e2e runs.
e2e/nvmeof.go	Adds an NVMe-oF snapshot + restore-from-snapshot e2e test with backend validation.
deploy/nvmeof/kubernetes/csi-nvmeofplugin-provisioner.yaml	Adds the `csi-snapshotter` sidecar to the NVMe-oF provisioner Deployment.

Suppressed comments (2)

e2e/nvmeof.go:546

If snapshot creation succeeds but a later step fails, the VolumeSnapshot can remain and impact later ordered specs. Consider adding a best-effort deferred cleanup immediately after successful snapshot creation.

			err = createSnapshot(&snap, deployTimeout)
			Expect(err).ShouldNot(HaveOccurred())

e2e/nvmeof.go:562

If the restored PVC is created successfully but a later step fails, it can leak into subsequent ordered specs. Add a best-effort deferred cleanup right after successful creation to keep the suite self-cleaning on failures.

			err = createPVCAndvalidatePV(f.ClientSet, restorePVC, deployTimeout)
			Expect(err).ShouldNot(HaveOccurred())

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

gadididi · 2026-08-11T07:17:18Z

@nixpanic , the last forced push because I rebased onto devel

nixpanic · 2026-08-14T07:00:56Z

/queue

nixpanic · 2026-08-14T07:03:14Z

Oh no, a merge conflict 😞

mergify · 2026-08-14T07:07:41Z

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

nixpanic · 2026-08-26T08:50:41Z

/test ci/centos/mini-e2e/k8s-1.37/nvmeof

nixpanic · 2026-08-26T09:27:49Z

The new test was run and passed:

nvmeof Test NVMe CSI Create snapshot and restore from snapshot
/go/src/github.com/ceph/ceph-csi/e2e/nvmeof.go:502
  STEP: Creating a kubernetes client @ 08/26/26 09:12:36.197
  I0826 09:12:36.197106   84092 util.go:414] >>> kubeConfig: /root/.kube/config
  STEP: Building a namespace api object, basename nvmeof @ 08/26/26 09:12:36.198
  STEP: Waiting for a default service account to be provisioned in namespace @ 08/26/26 09:12:36.206
  STEP: Waiting for kube-root-ca.crt to be provisioned in namespace @ 08/26/26 09:12:36.209
  STEP: Creating VolumeSnapshotClass @ 08/26/26 09:12:36.211
...

Once the other PRs are #6479 and #6478 are merged, this can be scheduled for automatic rebasing and testing by leaving the /queue comment.

nixpanic · 2026-08-26T12:19:12Z

/queue

ceph-csi-bot · 2026-08-26T12:19:31Z

@Mergifyio rebase

mergify · 2026-08-26T12:19:41Z

rebase

🛑 The pull request rule doesn't match anymore

Details

This action has been cancelled.

Test flow: 1. Create a source PVC 2. Create a snapshot of the source PVC 3. Create a new PVC restored from the snapshot 4. Delete the restored PVC 5. Delete the snapshot 6. Delete the source PVC Signed-off-by: gadi-didi <[email protected]>

adding this for snapshot e2e test. the nvmeof csi supports snapshot capability (it redirect the request to his backend server - rbd csi) Signed-off-by: gadi-didi <[email protected]>

ceph-csi-bot · 2026-08-26T12:20:12Z

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

ceph-csi-bot · 2026-08-26T12:20:13Z

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

ceph-csi-bot · 2026-08-26T12:20:13Z

/test ci/centos/upgrade-tests-cephfs

ceph-csi-bot · 2026-08-26T12:20:13Z

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

ceph-csi-bot · 2026-08-26T12:20:14Z

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

ceph-csi-bot · 2026-08-26T12:20:14Z

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

ceph-csi-bot · 2026-08-26T12:20:14Z

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

ceph-csi-bot · 2026-08-26T12:20:14Z

/test ci/centos/upgrade-tests-rbd

ceph-csi-bot · 2026-08-26T12:20:14Z

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

ceph-csi-bot · 2026-08-26T12:20:15Z

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

ceph-csi-bot · 2026-08-26T12:20:15Z

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

mergify · 2026-08-26T16:03:55Z

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-08-26T16:03:57Z

Merge Queue Status

✅ Entered queue — 2026-08-26 16:03 UTC · Rule: default · triggered by merge protections
✅ Checks skipped · PR is already up-to-date
✅ Merged — 2026-08-26 16:04 UTC · at e94f7f615c664453a59a84ed16b370311a27197e · rebase

This pull request spent 10 seconds in the queue, including 1 second running CI.

Required conditions to merge

github-review-approved [🛡 GitHub branch protection]
- e2e: add snapshot test in nvmeof csi #6438

gadididi requested review from iPraveenParihar and nixpanic July 30, 2026 06:41

mergify Bot added component/nvme-of Issues and PRs related to NVMe-oF. component/testing Additional test cases or CI work labels Jul 30, 2026

gadididi self-assigned this Jul 30, 2026

nixpanic reviewed Jul 30, 2026

View reviewed changes

Comment thread e2e/nvmeof.go Outdated

gadididi force-pushed the e2e/nvmeof_add_snapshot_test branch from 98f27fe to 6520e42 Compare August 2, 2026 07:59

gadididi requested a review from nixpanic August 2, 2026 08:00

nixpanic previously approved these changes Aug 4, 2026

View reviewed changes

nixpanic requested a review from a team August 4, 2026 09:27

Copilot AI lite review requested due to automatic review settings August 9, 2026 13:49

gadididi requested a review from a team as a code owner August 9, 2026 13:49

Copilot started reviewing on behalf of gadididi August 9, 2026 13:50 View session

Copilot AI reviewed Aug 9, 2026

View reviewed changes

Comment thread e2e/snapshot.go

Comment thread e2e/nvmeof.go

gadididi force-pushed the e2e/nvmeof_add_snapshot_test branch from 5683de4 to acf0a75 Compare August 11, 2026 07:16

gadididi requested a review from nixpanic August 11, 2026 07:16

nixpanic approved these changes Aug 13, 2026

View reviewed changes

Comment thread e2e/snapshot.go

nixpanic requested a review from a team August 13, 2026 09:25

Madhu-1 previously approved these changes Aug 13, 2026

View reviewed changes

nixpanic mentioned this pull request Aug 14, 2026

e2e: implement setEnableFencing for OperatorDeployment #6452

Merged

4 tasks done

nixpanic force-pushed the e2e/nvmeof_add_snapshot_test branch from acf0a75 to 4ceb2cc Compare August 14, 2026 07:36

ceph-csi-bot force-pushed the e2e/nvmeof_add_snapshot_test branch from cfa5bc7 to d535bfe Compare August 26, 2026 08:50

ceph-csi-bot added the queued/rebase label Aug 26, 2026

gadididi added 2 commits August 26, 2026 12:19

e2e: add snapshot test in nvmeof csi

2dba3e1

Test flow: 1. Create a source PVC 2. Create a snapshot of the source PVC 3. Create a new PVC restored from the snapshot 4. Delete the restored PVC 5. Delete the snapshot 6. Delete the source PVC Signed-off-by: gadi-didi <[email protected]>

nvmeof: add csi-snapshotter sidecar to controller deployment

e94f7f6

adding this for snapshot e2e test. the nvmeof csi supports snapshot capability (it redirect the request to his backend server - rbd csi) Signed-off-by: gadi-didi <[email protected]>

ceph-csi-bot force-pushed the e2e/nvmeof_add_snapshot_test branch from d535bfe to e94f7f6 Compare August 26, 2026 12:19

ceph-csi-bot added ok-to-test Label to trigger E2E tests and removed queued/rebase labels Aug 26, 2026

ceph-csi-bot added ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. and removed ok-to-test Label to trigger E2E tests labels Aug 26, 2026

mergify Bot removed the ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. label Aug 26, 2026

mergify Bot merged commit 415b565 into ceph:devel Aug 26, 2026
44 checks passed

gadididi deleted the e2e/nvmeof_add_snapshot_test branch August 26, 2026 20:15

Conversation

gadididi commented Jul 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

nixpanic commented Aug 4, 2026

Uh oh!

gadididi commented Aug 4, 2026

Uh oh!

nixpanic commented Aug 5, 2026

Uh oh!

gadididi commented Aug 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

gadididi commented Aug 11, 2026

Uh oh!

Uh oh!

nixpanic commented Aug 14, 2026

Uh oh!

nixpanic commented Aug 14, 2026

Uh oh!

mergify Bot commented Aug 14, 2026

Uh oh!

nixpanic commented Aug 26, 2026

Uh oh!

nixpanic commented Aug 26, 2026

Uh oh!

nixpanic commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

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

Uh oh!

🛑 The pull request rule doesn't match anymore

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

ceph-csi-bot commented Aug 26, 2026

Uh oh!

mergify Bot commented Aug 26, 2026

Uh oh!

mergify Bot commented Aug 26, 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

gadididi commented Jul 30, 2026 •

edited

Loading

mergify Bot commented Aug 26, 2026 •

edited

Loading

mergify Bot commented Aug 26, 2026 •

edited

Loading