Skip to content

rbd: fix missing data pool#6086

Merged
mergify[bot] merged 2 commits into
ceph:develfrom
iPraveenParihar:rbd/fix-missing-data-pool
Mar 10, 2026
Merged

rbd: fix missing data pool#6086
mergify[bot] merged 2 commits into
ceph:develfrom
iPraveenParihar:rbd/fix-missing-data-pool

Conversation

@iPraveenParihar

@iPraveenParihar iPraveenParihar commented Feb 18, 2026

Copy link
Copy Markdown
Contributor

Describe what this PR does

Problem:

This commit adds populateDataPool() to retrieve the data pool
from the source RBD image, ensuring the data pool is present
in snapshot image.

Fixes: #4761

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

@mergify mergify Bot added the bug Something isn't working label Feb 18, 2026
@iPraveenParihar iPraveenParihar changed the title Rbd/fix missing data pool Rbd: fix missing data pool Feb 18, 2026
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar changed the title Rbd: fix missing data pool rbd: fix missing data pool Feb 18, 2026
@mergify mergify Bot added the component/rbd Issues related to RBD label Feb 18, 2026
@Madhu-1

Madhu-1 commented Feb 18, 2026

Copy link
Copy Markdown
Collaborator

@iPraveenParihar i have added complete E2E testing for EC #6087 please feel free to pick that changes and run on top of this to verify everything works

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from d15c81f to 752395a Compare February 18, 2026 10:47
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from 752395a to 56b034f Compare February 18, 2026 13:10
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from 56b034f to 1415a5e Compare February 18, 2026 13:57
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from 1415a5e to 0d3f17a Compare February 18, 2026 14:48
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from 0d3f17a to d12faca Compare February 19, 2026 04:01
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from d12faca to f59d806 Compare February 19, 2026 04:55
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar iPraveenParihar marked this pull request as ready for review February 19, 2026 06:41
@iPraveenParihar iPraveenParihar marked this pull request as draft February 19, 2026 06:41
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

@iPraveenParihar i have added complete E2E testing for EC #6087 please feel free to pick that changes and run on top of this to verify everything works

@Madhu-1 the e2e has passed!

@iPraveenParihar iPraveenParihar marked this pull request as ready for review February 19, 2026 09:04

@Madhu-1 Madhu-1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small doc nits, LGTM

Comment thread internal/rbd/rbd_util.go Outdated
}

// getDataPoolID returns the data pool ID for the RBD image.
// For images with erasure-coded data pools, this returns the ID of the pool

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// For images with erasure-coded data pools, this returns the ID of the pool
// For an image with an erasure-coded data pool, this returns the ID of the pool

Comment thread internal/rbd/rbd_util.go Outdated
Comment on lines +558 to +561
// populateDataPool retrieves and sets the data pool name for erasure-coded volumes.
// For images with a separate data pool (e.g., erasure-coded pools), this ensures
// the DataPool field is populated so that clones and snapshots preserve the data
// pool configuration. Errors are logged but not returned as this is non-fatal.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// populateDataPool retrieves and sets the data pool name for erasure-coded volumes.
// For images with a separate data pool (e.g., erasure-coded pools), this ensures
// the DataPool field is populated so that clones and snapshots preserve the data
// pool configuration. Errors are logged but not returned as this is non-fatal.
// populateDataPool retrieves and sets the data pool name for erasure-coded volume.
// For image with a separate data pool (e.g., erasure-coded pool), this ensures
// the DataPool field is populated so that clone and snapshot preserve the data
// pool configuration. Errors are logged but not returned as this is non-fatal.

Comment thread internal/rbd/rbd_util.go Outdated
return
}

if dataPoolID == util.InvalidPoolID {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When will this be reached? i assume this will happen for the replicated pool, if yes please add a comment about this check

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch from f59d806 to 9f003db Compare March 2, 2026 07:05
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

Comment thread internal/rbd/rbd_util.go Outdated
// For image with a separate data pool (e.g., erasure-coded pool), this ensures
// the DataPool field is populated so that clone and snapshot preserve the data
// pool configuration. Errors are logged but not returned as this is non-fatal.
func (rv *rbdVolume) populateDataPool(ctx context.Context, cr *util.Credentials) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to return an error from this function and handle it at the caller

@iPraveenParihar iPraveenParihar force-pushed the rbd/fix-missing-data-pool branch 2 times, most recently from 09e9e41 to 24ba2d3 Compare March 2, 2026 08:14
@iPraveenParihar

Copy link
Copy Markdown
Contributor Author

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Mar 10, 2026
@mergify mergify Bot added the queued label Mar 10, 2026
iPraveenParihar and others added 2 commits March 10, 2026 09:21
This commit adds populateDataPool() to retrieve the data pool
from the source RBD image, ensuring the data pool is present
in snapshot image.

Signed-off-by: Praveen M <m.praveen@ibm.com>
This PR adds the E2E testing to
clone from replicapool to EC pool
and from EC pool to replicapool
and validates the images are created
in the right pool.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 8ba6ffb)
Signed-off-by: Praveen M <m.praveen@ibm.com>
@ceph-csi-bot ceph-csi-bot force-pushed the rbd/fix-missing-data-pool branch from 559cb1c to e7aaf2e Compare March 10, 2026 09:21
@mergify

mergify Bot commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

Merge Queue Status

  • Entered queue2026-03-10 09:21 UTC · Rule: default
  • Checks passed · in-place
  • Merged2026-03-10 12:11 UTC · at e7aaf2ec802235e9c2ed399cad1a33fc5d671d8a

This pull request spent 2 hours 49 minutes 58 seconds in the queue, including 2 hours 49 minutes 40 seconds running CI.

Required conditions to merge

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

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot

Copy link
Copy Markdown
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Mar 10, 2026
@mergify

mergify Bot commented Mar 10, 2026

Copy link
Copy Markdown
Contributor

queue

☑️ This pull request is already queued

@mergify mergify Bot merged commit 8761423 into ceph:devel Mar 10, 2026
40 checks passed
@mergify mergify Bot removed the queued label Mar 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working ci/in-progress/e2e This label acts like a guard and prevents Mergify from adding the `ok-to-test` label again. component/rbd Issues related to RBD

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CSI snapshots of an erasure-coded-backed volume stores snapshot data in the metadata pool

4 participants