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 rollback if failed to disable mirroring for image #11260

Merged
merged 1 commit into from Oct 10, 2016

Conversation

runsisi
Copy link
Contributor

@runsisi runsisi commented Sep 29, 2016

disable mirroring for demoted image stucks in disabling state

Signed-off-by: runsisi runsisi@zte.com.cn

r = mirror_image_disable_internal(ictx, force);
if (r < 0) {
return r;
r = mirror_image_disable_internal(ictx, force);

Choose a reason for hiding this comment

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

I believe this was outside the block due to snap_lock being held.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry, did not notice the lock :(
updated and moved the code needs the snap_lock into a block.
thanks.

Signed-off-by: runsisi <runsisi@zte.com.cn>
@dillaman dillaman merged commit 297f21d into ceph:master Oct 10, 2016
@runsisi runsisi deleted the wip-fix-mirror-image-disable branch October 11, 2016 00:31
liewegas pushed a commit to liewegas/ceph that referenced this pull request Nov 18, 2016
If given only 8GB RAM,  ceph_test_msgr may abort with buffer::bad_alloc.

http://tracker.ceph.com/issues/11260 Fixes: ceph#11260

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit eac791c)
liewegas pushed a commit that referenced this pull request Dec 14, 2016
If given only 8GB RAM,  ceph_test_msgr may abort with buffer::bad_alloc.

http://tracker.ceph.com/issues/11260 Fixes: #11260

Signed-off-by: Loic Dachary <loic@dachary.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants