From dd747912cee2cfafa205b4b8390a55d3062f9484 Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 9 Apr 2020 00:06:14 +0300 Subject: [PATCH] os/bluestore: fix huge (>4GB) bluefs reads Signed-off-by: Igor Fedotov (cherry picked from commit fe558c4dd12b25b2d523987f22fde5b5898cfb83) Conflicts: (still present buf param in BlueFS::read, lack of )https://github.com/ceph/ceph/pull/34421) src/os/bluestore/BlueFS.h src/os/bluestore/BlueRocksEnv.cc src/test/objectstore/test_bluefs.cc --- src/test/objectstore/test_bluefs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/objectstore/test_bluefs.cc b/src/test/objectstore/test_bluefs.cc index 5f1dd140256ae..68db26f77f5f7 100644 --- a/src/test/objectstore/test_bluefs.cc +++ b/src/test/objectstore/test_bluefs.cc @@ -304,7 +304,7 @@ TEST(BlueFS, very_large_write) { unique_ptr huge_buf(new char[h->file->fnode.size]); auto l = h->file->fnode.size; int64_t r = fs.read(h, &readbuf, 0, l, NULL, huge_buf.get()); - ASSERT_EQ(r, l); + ASSERT_EQ(r, (int64_t)l); delete h; } fs.umount(); -- 2.39.5