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

nautilus: librbd: new "write_zeroes" API methods to supplement the "discard" APIs #36250

Merged
merged 3 commits into from Jul 28, 2020

Conversation

dillaman
Copy link

Jason Dillaman added 3 commits July 22, 2020 15:14
Unlike the existing 'discard' option which is more of a hint to
attempt to release space, the new 'write_zeroes' APIs will ensure
that the entire provided extent is fully zeroed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit ae6dd86)

Conflicts:
	src/librbd/api/Io.h/cc: logic exists in ImageRequestWQ files
	src/librbd/librbd.cc: trivial resolution due missing api::Io
	src/test/librbd/test_librbd.cc: trivial resolution
(cherry picked from commit 0e3add9)

Conflicts:
        src/librbd/io/ImageRequestWQ.cc: different locks and no overlap guard
        src/test/librbd/test_librbd.cc: trivial resolution
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c27d744)
(cherry picked from commit 6a88418)
Fixes: https://tracker.ceph.com/issues/45986
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit f319ecf)
(cherry picked from commit f53e43c)
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

@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa labels Jul 26, 2020
@smithfarm
Copy link
Contributor

smithfarm commented Jul 26, 2020

@dillaman Do the multiple "(cherry picked from commit ...)" lines in the commit messages make sense to you?

(I'm guessing . . . they are cherry-picked from the open octopus PR #36247 ? Should we wait to merge this PR until that one merges, in case the octopus SHA1s change in the meantime?)

@dillaman
Copy link
Author

@dillaman Do the multiple "(cherry picked from commit ...)" lines in the commit messages make sense to you?

(I'm guessing . . . they are cherry-picked from the open octopus PR #36247 ? Should we wait to merge this PR until that one merges, in case the octopus SHA1s change in the meantime?)

Yup and yup. I’ve always found it easier to not start over with a cherry-pick and instead base it on the previous release’s effort.

@yuriw
Copy link
Contributor

yuriw commented Jul 27, 2020

@yuriw yuriw merged commit f59f48a into ceph:nautilus Jul 28, 2020
@smithfarm smithfarm changed the title nautilus: librbd: new 'write_zeroes' API methods to suppliment the discard APIs nautilus: librbd: new 'write_zeroes' API methods to supplement the "discard" APIs Jul 29, 2020
@smithfarm smithfarm changed the title nautilus: librbd: new 'write_zeroes' API methods to supplement the "discard" APIs nautilus: librbd: new "write_zeroes" API methods to supplement the "discard" APIs Jul 29, 2020
@smithfarm
Copy link
Contributor

Oops. Nautilus PR got merged before the Octopus one from which it was cherry-picked :-( Next time I'll try to remember to add DNM.

I also tend to cherry-pick from the newer stable branch if it makes the conflict resolution easier.

@smithfarm
Copy link
Contributor

So, apparently this broke the i386 build? See #36620

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants