nautilus: common/buffer: adjust align before calling posix_memalign() #41246
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
posix_memalign() requires alignment argument to be a multiple of sizeof(void *). Since it is an implementation detail of buffer, it needs to be adjusted there -- buffer consumers have no way of knowing that passing e.g. align == 4 is incorrect. One place already does the adjustment, but only for align == 0. The other just asserts. Fix both and remove the "power of two" assertion. Let posix_memalign() return EINVAL and handle that by throwing buffer::bad_alloc, as expected by the consumers. Fixes: https://tracker.ceph.com/issues/50646 Signed-off-by: Ilya Dryomov <idryomov@gmail.com> (cherry picked from commit aa31ddf) Conflicts: src/common/buffer.cc [ commit ea32d80 ("common: drop sharing of buffer::raw outside bufferlist.") not in nautilus ]
We want buffer::bad_alloc, not std::bad_alloc. Otheriwise, we end up with a confusing error failed decoding of frame header: Bad allocation from ProtocolV2::run_continuation(), printed after frame header is successfully decoded. Signed-off-by: Ilya Dryomov <idryomov@gmail.com> (cherry picked from commit 67bb6cf)
|
jenkins retest this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/50700
backport of #41143
parent tracker: https://tracker.ceph.com/issues/50646