From 49872ccf083947a8cf46f7a84591d1ee67e2c767 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Fri, 21 Jan 2022 01:50:22 +0000 Subject: [PATCH] test/bufferlist: ensure rebuild_aligned_size_and_memory() always rebuilds. Before the patch the test case was showing an unreliable behaviour dependent on the underlying memory allocator. It was because the bufferlist rebuild can be skipped, resulting in unchanged number of buffers, if all of them begin at aligned addresses. The commit fixes that by allocating a 4 KiB-aligned buffer and offsetting it by a small constant (42) to ensure the memory added to the bufferlist begins at non-4 KiB address. Signed-off-by: Radoslaw Zarzynski (cherry picked from commit 88176acd27b0d495abf9396c7ae2c6ec3fa46b1b) --- src/test/bufferlist.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/test/bufferlist.cc b/src/test/bufferlist.cc index a76dfbd44b514..0beb9ce09360c 100644 --- a/src/test/bufferlist.cc +++ b/src/test/bufferlist.cc @@ -1660,13 +1660,14 @@ TEST(BufferList, rebuild_aligned_size_and_memory) { * scenario where the first bptr is both size and memory aligned and * the second is 0-length */ bl.clear(); - bufferptr ptr1(buffer::create_aligned(4096, 4096)); - bl.append(ptr1); - bufferptr ptr(10); - /* bl.back().length() must be 0 */ - bl.append(ptr, 0, 0); + bl.append(bufferptr{buffer::create_aligned(4096, 4096)}); + bufferptr ptr(buffer::create_aligned(42, 4096)); + /* bl.back().length() must be 0. offset set to 42 guarantees + * the entire list is unaligned. */ + bl.append(ptr, 42, 0); EXPECT_EQ(bl.get_num_buffers(), 2); EXPECT_EQ(bl.back().length(), 0); + EXPECT_FALSE(bl.is_aligned(4096)); /* rebuild_aligned() calls rebuild_aligned_size_and_memory(). * we assume the rebuild always happens. */ EXPECT_TRUE(bl.rebuild_aligned(4096)); -- 2.39.5