From 8e36cbae7596e7f5257ebdcba21eeec9a5cf0b29 Mon Sep 17 00:00:00 2001 From: Gabriel BenHanokh Date: Mon, 21 Mar 2022 12:54:10 +0200 Subject: [PATCH] Fix a problem in store_test::BluestoreBrokenNoSharedBlobRepairTest where the check for active null-fm was wrong and so reporting bogus errors when null-fm was inactive The check need to access dynamic value and not config setting (which can be overridden) Signed-off-by: Gabriel BenHanokh (cherry picked from commit 2969539d20a8157d62ae27f842c43b801efdc0ee) --- src/test/objectstore/store_test.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 661178879e23d..64e6e60c0cdee 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -9366,13 +9366,15 @@ TEST_P(StoreTestSpecificAUSize, BluestoreBrokenNoSharedBlobRepairTest) { { cerr << "fscking/fixing" << std::endl; + // we need to check for null-manager before umount() + bool has_null_manager = bstore->has_null_manager(); bstore->umount(); // depending on the allocation map's source we can // either observe or don't observe an additional // extent leak detection. Hence adjusting the expected // value size_t expected_error_count = - g_ceph_context->_conf->bluestore_allocation_from_file ? + has_null_manager ? 5: // 4 sb ref mismatch errors + 1 statfs mismatch 7; // 4 sb ref mismatch errors + 1 statfs + 1 block leak + 1 non-free ASSERT_EQ(bstore->fsck(false), expected_error_count); -- 2.39.5