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

librbd: fix issues discovered in clone v2 during upgrade tests #20406

Merged
merged 2 commits into from Feb 14, 2018

Conversation

dillaman
Copy link

No description provided.

if (r < 0 && r != -ENOENT) {
return r;
}
bool has_parent = (r != -ENOENT && parent.pool != -1);
Copy link
Contributor

Choose a reason for hiding this comment

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

nit (could be just ignored): r == 0 (or >= 0) looks a bit more appropriate to me here.

Copy link
Contributor

@trociny trociny left a comment

Choose a reason for hiding this comment

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

lgtm

Jason Dillaman added 2 commits February 13, 2018 09:14
After removing the last snapshot linked to a parent image,
don't clear the CLONE_CHILD op feature bit if the image HEAD
is still linked to the parent.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Fixes: http://tracker.ceph.com/issues/22979
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
@trociny
Copy link
Contributor

trociny commented Feb 14, 2018

@trociny trociny merged commit ad76502 into ceph:master Feb 14, 2018
@dillaman dillaman deleted the wip-22979 branch February 14, 2018 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants