rbd: return group not found error for Get,Delete RPC calls by Nikhil-Ladha · Pull Request #5001 · ceph/ceph-csi

Nikhil-Ladha · 2024-12-04T06:39:46Z

We should return NotFound GRPC status if the group doesn't exists for ControllerGetVolumeGroup RPC call.
And, an empty/OK response for DeleteVolumeGroup if the group doesn't exists

Fixes: #4999

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

Please paste the testing logs.

internal/csi-addons/rbd/volumegroup.go

internal/rbd/group/volume_group.go

Nikhil-Ladha · 2024-12-04T08:49:51Z

Please paste the testing logs.

[nladha@dhcp53-204 ~]$ kubectl exec -it deployments/csi-rbdplugin-provisioner -c csi-addons -n rook-ceph -- csi-addons --endpoint unix:///csi/csi-addons.sock -operation ControllerGetVolumeGroup -volumegroupid 0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa -secret rook-ceph/rook-csi-rbd-provisioner
E1204 08:42:48.273772      11 volumegroup.go:174] Failed to get volume group: rpc error: code = NotFound desc = could not find volume group "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": failed to get volume group with id "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": RBD group not found
ERROR: failed to execute "ControllerGetVolumeGroup": rpc error: code = NotFound desc = could not find volume group "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": failed to get volume group with id "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": RBD group not found
command terminated with exit code 1
[nladha@dhcp53-204 ~]$ kubectl exec -it deployments/csi-rbdplugin-provisioner -c csi-addons -n rook-ceph -- csi-addons --endpoint unix:///csi/csi-addons.sock -operation DeleteVolumeGroup -volumegroupid 0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa -secret rook-ceph/rook-csi-rbd-provisioner
Volume Group Deleted.

csi-rbdplugin-provisioner logs

I1204 08:42:48.177599       1 utils.go:266] ID: 24 GRPC call: /volumegroup.Controller/ControllerGetVolumeGroup
I1204 08:42:48.180222       1 utils.go:267] ID: 24 GRPC request: {"secrets":"***stripped***","volume_group_id":"0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa"}
I1204 08:42:48.260968       1 util.go:102] ID: 24 object for volume group "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa" has been initialized
E1204 08:42:48.270666       1 omap.go:212] ID: 24 omap not found (pool="replicapool", namespace="", name="csi.volume.group.71f1dc66-e334-4b9b-9f7c-536f4c3f03fa"): rados: ret=-2, No such file or directory
W1204 08:42:48.271027       1 volumegroupjournal.go:409] ID: 24 unable to read omap values: pool missing: key not found: rados: ret=-2, No such file or directory
E1204 08:42:48.271583       1 volume_group.go:89] ID: 24 volume group with id 0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa not found
E1204 08:42:48.271747       1 utils.go:271] ID: 24 GRPC error: rpc error: code = NotFound desc = could not find volume group "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": failed to get volume group with id "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa": RBD group not found
I1204 08:43:29.919432       1 utils.go:266] ID: 25 GRPC call: /volumegroup.Controller/DeleteVolumeGroup
I1204 08:43:29.920103       1 utils.go:267] ID: 25 GRPC request: {"secrets":"***stripped***","volume_group_id":"0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa"}
I1204 08:43:29.921395       1 util.go:102] ID: 25 object for volume group "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa" has been initialized
E1204 08:43:29.924151       1 omap.go:212] ID: 25 omap not found (pool="replicapool", namespace="", name="csi.volume.group.71f1dc66-e334-4b9b-9f7c-536f4c3f03fa"): rados: ret=-2, No such file or directory
W1204 08:43:29.924554       1 volumegroupjournal.go:409] ID: 25 unable to read omap values: pool missing: key not found: rados: ret=-2, No such file or directory
E1204 08:43:29.924648       1 volume_group.go:89] ID: 25 volume group with id 0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa not found
I1204 08:43:29.925068       1 volumegroup.go:194] ID: 25 VolumeGroup "0001-0009-rook-ceph-0000000000000002-71f1dc66-e334-4b9b-9f7c-536f4c3f03fa" doesn't exists
I1204 08:43:29.925668       1 utils.go:273] ID: 25 GRPC response: null

internal/csi-addons/rbd/volumegroup.go

internal/rbd/group/volume_group.go

nixpanic

The approach looks good to me. Just a small mistake that needs correcting.

internal/rbd/group/util.go

Madhu-1

A followup PR is required to update the DeleteVolumeGroupSnapshot and GetvolumeGroupsnapshot RPC to make use of ErrRBDGroupNotFound to return success and not found and even in ControllerGetVolumeGroup RPC as well

Nikhil-Ladha · 2024-12-11T12:09:12Z

A followup PR is required to update the DeleteVolumeGroupSnapshot and GetvolumeGroupsnapshot RPC to make use of ErrRBDGroupNotFound to return success and not found and even in ControllerGetVolumeGroup RPC as well

ControllerGetVolumeGroup is taken care off in this PR itself, only the GroupSnapshot RPCs need to be updated.
i.e, The ControllerGetVolumeGroup RPC calls GetVolumeGroupByID [1] function, that internally calls GetVolumeGroup which returns the ErrRBDGroupNotFound error, if the group doesn't exists. And, in the parent ControllerGetVolumeGroup RPC call, we return the NotFound status.code if the err != nil [3].

[1]

ceph-csi/internal/csi-addons/rbd/volumegroup.go

Line 434 in 6c0305c

vg, err := mgr.GetVolumeGroupByID(ctx, req.GetVolumeGroupId())

[2]

ceph-csi/internal/rbd/manager.go

Line 224 in 6c0305c

vg, err := rbd_group.GetVolumeGroup(ctx, id, mgr.csiID, creds, mgr)

[3]

ceph-csi/internal/csi-addons/rbd/volumegroup.go

Line 435 in 6c0305c

if err != nil {

Madhu-1 · 2024-12-11T12:12:12Z

A followup PR is required to update the DeleteVolumeGroupSnapshot and GetvolumeGroupsnapshot RPC to make use of ErrRBDGroupNotFound to return success and not found and even in ControllerGetVolumeGroup RPC as well

ControllerGetVolumeGroup is taken care off in this PR itself, only the GroupSnapshot RPCs need to be updated.

i was not able to find the code for it, can you please point me to the code.

Nikhil-Ladha · 2024-12-11T12:15:56Z

@Madhu-1 updated my previous comment with links, please check now.

test logs have been provided

nixpanic · 2024-12-12T17:07:01Z

@Mergifyio queue

mergify · 2024-12-12T17:07:09Z

queue

✅ The pull request has been merged automatically

Details

The pull request has been merged automatically at c7d54ab

We should return NotFound status if the group doesn't exists for ControllerGetVolumeGroup RPC call. And, an empty/OK response for DeleteVolumeGroup if the group doesn't exists Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>

ceph-csi-bot · 2024-12-12T19:27:19Z

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

ceph-csi-bot · 2024-12-12T19:27:19Z

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

ceph-csi-bot · 2024-12-12T19:27:19Z

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

ceph-csi-bot · 2024-12-12T19:27:20Z

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

ceph-csi-bot · 2024-12-12T19:27:20Z

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

ceph-csi-bot · 2024-12-12T19:27:20Z

/test ci/centos/upgrade-tests-cephfs

ceph-csi-bot · 2024-12-12T19:27:20Z

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

ceph-csi-bot · 2024-12-12T19:27:21Z

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

ceph-csi-bot · 2024-12-12T19:27:21Z

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

ceph-csi-bot · 2024-12-12T19:27:21Z

/test ci/centos/upgrade-tests-rbd

ceph-csi-bot · 2024-12-12T19:27:22Z

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

Nikhil-Ladha · 2024-12-19T08:45:42Z

@Mergifyio backport release-v3.13

mergify · 2024-12-19T08:45:55Z

backport release-v3.13

❌ Command disallowed due to command restrictions in the Mergify configuration.

Details

sender-permission >= write

mergify bot added the component/rbd Issues related to RBD label Dec 4, 2024

Nikhil-Ladha force-pushed the issue4999/vg-get-delete branch from 24f2d77 to 7ecbcad Compare December 4, 2024 06:52

iPraveenParihar previously requested changes Dec 4, 2024

View reviewed changes

internal/csi-addons/rbd/volumegroup.go Show resolved Hide resolved

internal/csi-addons/rbd/volumegroup.go Show resolved Hide resolved

internal/rbd/group/volume_group.go Outdated Show resolved Hide resolved

Nikhil-Ladha force-pushed the issue4999/vg-get-delete branch from 7ecbcad to 65c8301 Compare December 4, 2024 08:25

Madhu-1 reviewed Dec 4, 2024

View reviewed changes

internal/csi-addons/rbd/volumegroup.go Show resolved Hide resolved

internal/rbd/group/volume_group.go Outdated Show resolved Hide resolved

Nikhil-Ladha force-pushed the issue4999/vg-get-delete branch from 65c8301 to bc593d0 Compare December 10, 2024 09:37

nixpanic requested changes Dec 10, 2024

View reviewed changes

internal/rbd/group/util.go Outdated Show resolved Hide resolved

Nikhil-Ladha force-pushed the issue4999/vg-get-delete branch from bc593d0 to 6c0305c Compare December 11, 2024 04:16

nixpanic approved these changes Dec 11, 2024

View reviewed changes

nixpanic requested review from Madhu-1 and iPraveenParihar December 11, 2024 11:49

Madhu-1 approved these changes Dec 11, 2024

View reviewed changes

Nikhil-Ladha force-pushed the issue4999/vg-get-delete branch from 6c0305c to 7595457 Compare December 12, 2024 19:26

mergify bot added the ok-to-test Label to trigger E2E tests label Dec 12, 2024

ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Dec 12, 2024

mergify bot merged commit c7d54ab into ceph:devel Dec 12, 2024
26 checks passed

Nikhil-Ladha mentioned this pull request Dec 19, 2024

util: return correct status code for VolumeGroupSnapshot #5024

Merged

iPraveenParihar added the backport-to-release-v3.13 Label to backport from devel to release-v3.13 branch label Dec 19, 2024

mergify bot mentioned this pull request Dec 19, 2024

rbd: return group not found error for Get,Delete RPC calls (backport #5001) #5037

Merged

Conversation

Nikhil-Ladha commented Dec 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iPraveenParihar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Nikhil-Ladha commented Dec 4, 2024

Uh oh!

Uh oh!

Uh oh!

nixpanic left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Madhu-1 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Nikhil-Ladha commented Dec 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Madhu-1 commented Dec 11, 2024

Uh oh!

Nikhil-Ladha commented Dec 11, 2024

Uh oh!

nixpanic commented Dec 12, 2024

Uh oh!

mergify bot commented Dec 12, 2024 • 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 Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

ceph-csi-bot commented Dec 12, 2024

Uh oh!

Uh oh!

Nikhil-Ladha commented Dec 19, 2024

Uh oh!

mergify bot commented Dec 19, 2024

❌ Command disallowed due to command restrictions in the Mergify configuration.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Nikhil-Ladha commented Dec 4, 2024 •

edited

Loading

Madhu-1 left a comment •

edited

Loading

Nikhil-Ladha commented Dec 11, 2024 •

edited

Loading

mergify bot commented Dec 12, 2024 •

edited

Loading