From 1a5a30f1b47e8d2d2ce201d56db3d178d328b9ef Mon Sep 17 00:00:00 2001 From: Igor Fedotov Date: Thu, 6 Oct 2016 14:17:40 +0000 Subject: [PATCH] test/store_test: BluestoreStatFSTest fixes for issues introduced with bluestore_compression_min_blob_size adjustment Signed-off-by: Igor Fedotov --- src/test/objectstore/store_test.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 80df222d861..3441d8b79f5 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -1435,9 +1435,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) { int r = store->statfs(&statfs); ASSERT_EQ(r, 0); ASSERT_EQ(0x30005, statfs.stored); - ASSERT_EQ(0x20000, statfs.allocated); + ASSERT_EQ(0x30000, statfs.allocated); ASSERT_LE(statfs.compressed, 0x10000); - ASSERT_EQ(0x30000, statfs.compressed_original); + ASSERT_EQ(0x20000, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); //force fsck EXPECT_EQ(store->umount(), 0); @@ -1455,9 +1455,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) { int r = store->statfs(&statfs); ASSERT_EQ(r, 0); ASSERT_EQ(0x30005 - 3 - 9, statfs.stored); - ASSERT_EQ(0x20000, statfs.allocated); + ASSERT_EQ(0x30000, statfs.allocated); ASSERT_LE(statfs.compressed, 0x10000); - ASSERT_EQ(0x30000 - 9, statfs.compressed_original); + ASSERT_EQ(0x20000 - 9, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); //force fsck EXPECT_EQ(store->umount(), 0); @@ -1478,9 +1478,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) { int r = store->statfs(&statfs); ASSERT_EQ(r, 0); ASSERT_EQ(0x30001 - 9 + 0x1000, statfs.stored); - ASSERT_EQ(0x30000, statfs.allocated); + ASSERT_EQ(0x40000, statfs.allocated); ASSERT_LE(statfs.compressed, 0x10000); - ASSERT_EQ(0x30000 - 9 - 0x1000, statfs.compressed_original); + ASSERT_EQ(0x20000 - 9 - 0x1000, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); //force fsck EXPECT_EQ(store->umount(), 0); @@ -1544,9 +1544,9 @@ TEST_P(StoreTest, BluestoreStatFSTest) { r = store->statfs(&statfs); ASSERT_EQ(r, 0); ASSERT_EQ(0x40000 - 2, statfs.stored); - ASSERT_EQ(0x20000, statfs.allocated); + ASSERT_EQ(0x30000, statfs.allocated); ASSERT_LE(statfs.compressed, 0x10000); - ASSERT_EQ(0x30000, statfs.compressed_original); + ASSERT_EQ(0x20000, statfs.compressed_original); ASSERT_EQ(0x10000, statfs.compressed_allocated); //force fsck EXPECT_EQ(store->umount(), 0); -- 2.47.3