From 128b95a2a930a19045c907f9dd8d09ce53d0e98f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 26 Aug 2016 15:15:22 -0400 Subject: [PATCH] ceph_test_objectstore: disable statfs checks on available space These are too sensitive to other activity, like bluefs files and bluefs vs bluestore freespace balancing. Signed-off-by: Sage Weil --- src/test/objectstore/store_test.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 856872416f57..7516bf19d974 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -1155,7 +1155,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { exists = store->exists(cid, hoid); ASSERT_EQ(true, exists); } - uint64_t available0 = 0; { struct store_statfs_t statfs; int r = store->statfs(&statfs); @@ -1167,7 +1166,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { //force fsck EXPECT_EQ(store->umount(), 0); EXPECT_EQ(store->mount(), 0); - available0 = statfs.available; } { ObjectStore::Transaction t; @@ -1183,7 +1181,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { ASSERT_EQ(r, 0); ASSERT_EQ(5, statfs.stored); ASSERT_EQ(0x10000, statfs.allocated); - ASSERT_EQ(available0 - 0x10000, statfs.available); ASSERT_EQ(0, statfs.compressed); ASSERT_EQ(0, statfs.compressed_original); ASSERT_EQ(0, statfs.compressed_allocated); @@ -1206,7 +1203,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { ASSERT_EQ(r, 0); ASSERT_EQ(0x30005, statfs.stored); ASSERT_EQ(0x20000, statfs.allocated); - ASSERT_EQ(available0 - 0x20000, statfs.available); ASSERT_LE(statfs.compressed, 0x10000); ASSERT_EQ(0x30000, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); @@ -1227,7 +1223,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { ASSERT_EQ(r, 0); ASSERT_EQ(0x30005 - 3 - 9, statfs.stored); ASSERT_EQ(0x20000, statfs.allocated); - ASSERT_EQ(available0 - 0x20000, statfs.available); ASSERT_LE(statfs.compressed, 0x10000); ASSERT_EQ(0x30000 - 9, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); @@ -1251,7 +1246,6 @@ TEST_P(StoreTest, BluestoreStatFSTest) { ASSERT_EQ(r, 0); ASSERT_EQ(0x30001 - 9 + 0x1000, statfs.stored); ASSERT_EQ(0x30000, statfs.allocated); - ASSERT_EQ(available0 - 0x30000, statfs.available); ASSERT_LE(statfs.compressed, 0x10000); ASSERT_EQ(0x30000 - 9 - 0x1000, statfs.compressed_original); ASSERT_EQ(statfs.compressed_allocated, 0x10000); -- 2.47.3