RBD: retain temp snap #5191

iPraveenParihar · 2025-03-05T09:39:38Z

Describe what this PR does

Currently, Ceph-CSI deletes RBD snapshot on temporary
cloned image (csi-vol-xxxx-temp@csi-vol-xxxx) which is
the parent of the final clone image.

The parent-child mirroring requires both the parent and child
images to be present (i.e, not in trash).

This commit makes enhancement to createRBDClone function by
introducing deleteSnap parameter. If deleteSnap is true,
the snapshot is deleted after the clone is created.

This is required to support mirroring of child image with its
parent image.

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!)

iPraveenParihar · 2025-03-06T08:10:58Z

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

iPraveenParihar · 2025-03-06T10:21:10Z

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

e2e/utils.go

e2e/rbd.go

iPraveenParihar · 2025-03-10T09:59:50Z

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

iPraveenParihar · 2025-03-10T11:25:18Z

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

iPraveenParihar · 2025-03-10T13:05:58Z

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

iPraveenParihar · 2025-03-10T15:30:34Z

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

Rakshith-R

Can you remove the go mod changes from this pr ?

iPraveenParihar · 2025-03-11T09:52:36Z

Can you remove the go mod changes from this pr ?

🤔Upon syncing go.mod with devel branch and doing go mod tidy updates these packages.

nixpanic

Definitely need to drop the go.mod and related change. Or put them in a separate commit.

internal/rbd/rbd_util.go

e2e/rbd_helper.go

iPraveenParihar · 2025-03-13T11:38:40Z

Can you remove the go mod changes from this pr ?

🤔Upon syncing go.mod with devel branch and doing go mod tidy updates these packages.

Also, now the go.sum seems to be changed when performing go mod tidy. Module github.com/aws/smithy-go was updated from v1.22.2 to v1.22.3 in PR. This is some weird issue am seeing recently.

iPraveenParihar · 2025-03-14T11:36:21Z

@nixpanic PTAL

iPraveenParihar · 2025-03-18T10:36:22Z

Thanks @Madhu-1 @Rakshith-R

iPraveenParihar · 2025-03-18T11:12:09Z

@Mergifyio queue

mergify · 2025-03-18T11:12:16Z

queue

🛑 The pull request has been removed from the queue `default`

The pull request can't be updated.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

mergify · 2025-03-18T11:12:20Z

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated

You should update or rebase your pull request manually.

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

iPraveenParihar · 2025-03-18T11:12:45Z

@Mergifyio rebase

Currently, Ceph-CSI deletes intermediate RBD snapshot on temporary cloned images (`csi-vol-xxxx-temp@csi-vol-xxxx`) which is the parent of the final clone image. The parent-child mirroring requires both the parent and child images to be present (i.e, not in trash). This commit makes enhancement to `createRBDClone` function by introducing `deleteSnap` parameter. If `deleteSnap` is true, the snapshot is deleted after the clone is created. This is required to support mirroring of child image with its parent image. Signed-off-by: Praveen M <[email protected]>

Signed-off-by: Praveen M <[email protected]>

mergify · 2025-03-18T11:12:59Z

rebase

✅ Branch has been successfully rebased

iPraveenParihar · 2025-03-18T11:45:29Z

@Mergifyio requeue

mergify · 2025-03-18T11:45:50Z

requeue

❌ This pull request head commit has not been previously disembarked from queue.

iPraveenParihar · 2025-03-18T11:46:51Z

@Mergifyio queue

mergify · 2025-03-18T11:46:56Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 2af7269

ceph-csi-bot · 2025-03-18T11:47:11Z

/test ci/centos/upgrade-tests-cephfs

ceph-csi-bot · 2025-03-18T11:47:12Z

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

ceph-csi-bot · 2025-03-18T11:47:12Z

/test ci/centos/upgrade-tests-rbd

ceph-csi-bot · 2025-03-18T11:47:12Z

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

ceph-csi-bot · 2025-03-18T11:47:12Z

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

ceph-csi-bot · 2025-03-18T11:47:12Z

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

ceph-csi-bot · 2025-03-18T11:47:13Z

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

ceph-csi-bot · 2025-03-18T11:47:13Z

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

ceph-csi-bot · 2025-03-18T11:47:15Z

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

ceph-csi-bot · 2025-03-18T11:47:16Z

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

ceph-csi-bot · 2025-03-18T11:47:16Z

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

mergify · 2025-03-18T13:42:23Z

This pull request has been removed from the queue for the following reason: pull request branch update failed.

The pull request can't be updated

You should update or rebase your pull request manually.

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

iPraveenParihar requested a review from Rakshith-R March 5, 2025 09:39

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from ebd3b12 to 08d022a Compare March 6, 2025 08:07

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 08d022a to b796cb4 Compare March 6, 2025 10:21

Rakshith-R reviewed Mar 10, 2025

View reviewed changes

e2e/utils.go Outdated Show resolved Hide resolved

Rakshith-R reviewed Mar 10, 2025

View reviewed changes

e2e/rbd.go Outdated Show resolved Hide resolved

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from b796cb4 to 9526b7c Compare March 10, 2025 11:25

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 9526b7c to 85faae3 Compare March 10, 2025 13:05

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 85faae3 to 0d15614 Compare March 10, 2025 15:25

iPraveenParihar marked this pull request as ready for review March 11, 2025 07:38

iPraveenParihar requested a review from Rakshith-R March 11, 2025 07:38

iPraveenParihar changed the title ~~[WIP] RBD: retain temp snap~~ RBD: retain temp snap Mar 11, 2025

Rakshith-R reviewed Mar 11, 2025

View reviewed changes

nixpanic reviewed Mar 11, 2025

View reviewed changes

internal/rbd/rbd_util.go Outdated Show resolved Hide resolved

e2e/rbd_helper.go Outdated Show resolved Hide resolved

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 0d15614 to 1f16a8a Compare March 13, 2025 10:54

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 1f16a8a to 1b5a91c Compare March 14, 2025 09:57

Rakshith-R mentioned this pull request Mar 14, 2025

ci: check for modified files after go mod checks #5223

Merged

6 tasks

iPraveenParihar force-pushed the rbd/retain-temp-snap branch 3 times, most recently from 1f16a8a to 6b3b710 Compare March 14, 2025 10:44

Rakshith-R previously approved these changes Mar 14, 2025

View reviewed changes

Rakshith-R requested a review from nixpanic March 14, 2025 10:45

Madhu-1 approved these changes Mar 18, 2025

View reviewed changes

Rakshith-R approved these changes Mar 18, 2025

View reviewed changes

iPraveenParihar added 2 commits March 18, 2025 11:12

e2e: validate RBD snapshot under temporary clone image is present

d650a6b

Signed-off-by: Praveen M <[email protected]>

iPraveenParihar force-pushed the rbd/retain-temp-snap branch from 3b3dfc2 to d650a6b Compare March 18, 2025 11:13

mergify bot added the ok-to-test Label to trigger E2E tests label Mar 18, 2025

ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Mar 18, 2025

mergify bot merged commit 2af7269 into ceph:devel Mar 18, 2025
36 of 37 checks passed

Uh oh!

RBD: retain temp snap #5191

RBD: retain temp snap #5191

Uh oh!

Conversation

iPraveenParihar commented Mar 5, 2025

Describe what this PR does

Uh oh!

iPraveenParihar commented Mar 6, 2025

Uh oh!

iPraveenParihar commented Mar 6, 2025

Uh oh!

Uh oh!

Uh oh!

iPraveenParihar commented Mar 10, 2025

Uh oh!

iPraveenParihar commented Mar 10, 2025

Uh oh!

iPraveenParihar commented Mar 10, 2025

Uh oh!

iPraveenParihar commented Mar 10, 2025

Uh oh!

Rakshith-R left a comment

Choose a reason for hiding this comment

Uh oh!

iPraveenParihar commented Mar 11, 2025

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

iPraveenParihar commented Mar 13, 2025

Uh oh!

iPraveenParihar commented Mar 14, 2025

Uh oh!

iPraveenParihar commented Mar 18, 2025

Uh oh!

iPraveenParihar commented Mar 18, 2025

Uh oh!

mergify bot commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛑 The pull request has been removed from the queue default

Uh oh!

mergify bot commented Mar 18, 2025

Uh oh!

iPraveenParihar commented Mar 18, 2025

Uh oh!

mergify bot commented Mar 18, 2025

✅ Branch has been successfully rebased

Uh oh!

iPraveenParihar commented Mar 18, 2025

Uh oh!

mergify bot commented Mar 18, 2025

❌ This pull request head commit has not been previously disembarked from queue.

Uh oh!

iPraveenParihar commented Mar 18, 2025

Uh oh!

mergify bot commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ The pull request has been merged automatically

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

ceph-csi-bot commented Mar 18, 2025

Uh oh!

mergify bot commented Mar 18, 2025 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented Mar 18, 2025 •

edited

Loading