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: 'trash list --long' will return a failure on non-cloned images #19540

Merged
merged 1 commit into from Dec 15, 2017

Conversation

Projects
None yet
2 participants
@dillaman
Copy link
Contributor

commented Dec 15, 2017

Signed-off-by: Jason Dillaman dillaman@redhat.com

@trociny
Copy link
Contributor

left a comment

It looks you meant '--long' in the log message.

@@ -236,8 +236,12 @@ int do_list(librbd::RBD &rbd, librados::IoCtx& io_ctx, bool long_flag,

std::string pool, image, snap, parent;
r = im.parent_info(&pool, &image, &snap);
if (r < 0 && r != -ENOENT)
if (r == -ENOENT) {
r = 0;

This comment has been minimized.

Copy link
@trociny

trociny Dec 15, 2017

Contributor

@dillaman we have if (r != -ENOENT) block below.

This comment has been minimized.

Copy link
@dillaman

dillaman Dec 15, 2017

Author Contributor

Yeah -- but since it doesn't exit and doesn't clear the error code, that -ENOENT error code will be returned when the function exits here: https://github.com/ceph/ceph/pull/19540/files#diff-8a78f96557c8ae5b23b41bc6330c430bR286

This comment has been minimized.

Copy link
@dillaman

dillaman Dec 15, 2017

Author Contributor

D'oh -- sorry, never mind

@dillaman dillaman force-pushed the dillaman:wip-rbd-trash-list-enoent branch from efcf429 to 1cf16c2 Dec 15, 2017

@dillaman dillaman changed the title rbd: 'trash list --all' will return a failure on non-cloned images rbd: 'trash list --long' will return a failure on non-cloned images Dec 15, 2017

rbd: 'trash list --long' will return a failure on non-cloned images
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

@dillaman dillaman force-pushed the dillaman:wip-rbd-trash-list-enoent branch from 1cf16c2 to bed3356 Dec 15, 2017

@trociny
Copy link
Contributor

left a comment

lgtm

@trociny trociny merged commit 18b9219 into ceph:master Dec 15, 2017

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details

@dillaman dillaman deleted the dillaman:wip-rbd-trash-list-enoent branch Dec 15, 2017

runsisi pushed a commit to runsisi/ceph that referenced this pull request Mar 20, 2018

Merge pull request ceph#19540 from dillaman/wip-rbd-trash-list-enoent
rbd: 'trash list --long' will return a failure on non-cloned images

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
(cherry picked from commit 18b9219)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.