Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RBD: improvments to existing code to better align with volumegroup #4743

Merged
merged 10 commits into from
Jul 31, 2024

Conversation

Madhu-1
Copy link
Collaborator

@Madhu-1 Madhu-1 commented Jul 30, 2024

This PR contains the commits taken out of #4739 to make the other PR smaller. This contains lot of improvement which is going to help for future implementation and this also takes care of handling the flattening before adding the image to the group.

@Madhu-1 Madhu-1 requested review from nixpanic, Rakshith-R and a team July 30, 2024 16:54
@Madhu-1 Madhu-1 force-pushed the implement-rbd-vg-mirror-1 branch 2 times, most recently from 9316f1f to 09f91db Compare July 30, 2024 17:05
Copy link
Contributor

@Rakshith-R Rakshith-R left a comment

Choose a reason for hiding this comment

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

tiny nits

internal/rbd/mirror.go Outdated Show resolved Hide resolved
internal/csi-addons/rbd/volumegroup.go Outdated Show resolved Hide resolved
internal/rbd/group/volume_group.go Show resolved Hide resolved
@Madhu-1 Madhu-1 force-pushed the implement-rbd-vg-mirror-1 branch from 9131288 to d2a3649 Compare July 31, 2024 07:23
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

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

few minor things that should be improved. Thanks for splitting these commits out of the larger one!

internal/csi-addons/rbd/volumegroup.go Show resolved Hide resolved
internal/csi-addons/rbd/volumegroup.go Outdated Show resolved Hide resolved
internal/csi-addons/rbd/replication.go Outdated Show resolved Hide resolved
internal/rbd/group/volume_group.go Show resolved Hide resolved
internal/csi-common/utils.go Outdated Show resolved Hide resolved
@Madhu-1 Madhu-1 force-pushed the implement-rbd-vg-mirror-1 branch from d2a3649 to 5fd5244 Compare July 31, 2024 09:03
@Madhu-1 Madhu-1 requested review from nixpanic and Rakshith-R July 31, 2024 09:03
internal/rbd/manager.go Show resolved Hide resolved
@Madhu-1 Madhu-1 requested a review from a team July 31, 2024 09:25
@Rakshith-R
Copy link
Contributor

@Mergifyio queue

Copy link
Contributor

mergify bot commented Jul 31, 2024

queue

🛑 The pull request has been removed from the queue default

The queue conditions cannot be satisfied due to failing checks.

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.

Madhu-1 added 10 commits July 31, 2024 09:49
updated GetVolumeByID to return more
descriptive error so that caller no
need to add more details in
the error message.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
implement journalledObject interface to
return the journal objects of the volume.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
This commit adds support for flattenMode option
for volumegroup.
If the flattenMode is set to "force" in
volumegroupreplicationclass parameters,
cephcsi will add a task to flatten the image
if it has parent before adding it to the group.
This enable cephcsi to then mirror such images
after flattening them.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
updating HandleParentImageExistence function
to return more details error which includes
the pool/namespace/image name

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
updating csiaddons spec to the
latest main.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
in ModifyVolumeGroupMembership RPC call,
flatten the required images before adding it
to the group or else if the parent is not
mirror enabled adding a child to the group
will fail.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
GetVolumeByID already returning detailed
error message, the caller just need to return
it. No need to add duplicate details to error
message.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
adding required ctx to the mirror
interface as ctx is required for
the volumegroup operations.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
updated the group stringer method
to have pool and namespace for
proper debugging/logging and to
use it with CLI as agrument as well.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
updated GetIDFromReplication to return
volumeGroupID if its present.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
@Madhu-1 Madhu-1 force-pushed the implement-rbd-vg-mirror-1 branch from 5fd5244 to 0f4e55d Compare July 31, 2024 09:49
@mergify mergify bot added the ok-to-test Label to trigger E2E tests label Jul 31, 2024
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot
Copy link
Collaborator

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

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Jul 31, 2024
@Madhu-1
Copy link
Collaborator Author

Madhu-1 commented Jul 31, 2024

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

@nixpanic
Copy link
Member

@Mergifyio requeue

Copy link
Contributor

mergify bot commented Jul 31, 2024

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

@mergify mergify bot merged commit 3a8981a into ceph:devel Jul 31, 2024
40 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.

4 participants