RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: honor FUA op flag for write_same() in write-around cache

Browse Source 
WriteAroundObjectDispatch::write_same() should pass op_flags through
to dispatch_io() so that it can bypass the cache if needed.

Fixes: https://tracker.ceph.com/issues/52956
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov 2021-10-15 18:13:55 +02:00
parent c19250ce3c
commit 0dcea098cf
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librbd/cache/WriteAroundObjectDispatch.cc vendored
View File

@ -113,8 +113,8 @@ bool WriteAroundObjectDispatch<I>::write_same(
ldout(cct, 20) << data_object_name(m_image_ctx, object_no) << " "
<< object_off << "~" << object_len << dendl;
return dispatch_io(object_no, object_off, object_len, 0, dispatch_result,
on_finish, on_dispatched);
return dispatch_io(object_no, object_off, object_len, op_flags,
dispatch_result, on_finish, on_dispatched);
}
template <typename I>

26
src/test/librbd/cache/test_mock_WriteAroundObjectDispatch.cc vendored
View File

@ -651,7 +651,7 @@ TEST_F(TestMockCacheWriteAroundObjectDispatch, UnoptimizedIOBlockedIO) {
finish_ctx_ptr2->complete(0);
}
TEST_F(TestMockCacheWriteAroundObjectDispatch, FUA) {
TEST_F(TestMockCacheWriteAroundObjectDispatch, WriteFUA) {
librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));
@ -675,5 +675,29 @@ TEST_F(TestMockCacheWriteAroundObjectDispatch, FUA) {
ASSERT_EQ(finish_ctx_ptr, &finish_ctx);
}
TEST_F(TestMockCacheWriteAroundObjectDispatch, WriteSameFUA) {
librbd::ImageCtx *ictx;
ASSERT_EQ(0, open_image(m_image_name, &ictx));
MockTestImageCtx mock_image_ctx(*ictx);
MockWriteAroundObjectDispatch object_dispatch(&mock_image_ctx, 16384, false);
InSequence seq;
bufferlist data;
data.append(std::string(512, '1'));
io::DispatchResult dispatch_result;
MockContext finish_ctx;
MockContext dispatch_ctx;
Context* finish_ctx_ptr = &finish_ctx;
ASSERT_FALSE(object_dispatch.write_same(0, 0, 8192, {{0, 8192}},
std::move(data), {},
LIBRADOS_OP_FLAG_FADVISE_FUA, {},
nullptr, nullptr, &dispatch_result,
&finish_ctx_ptr, &dispatch_ctx));
ASSERT_EQ(finish_ctx_ptr, &finish_ctx);
}
} // namespace cache
} // namespace librbd