From 2e588ede06a399644409a5ed05ce2fec2ea687a9 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 23 May 2024 11:06:41 +0000 Subject: [PATCH] test/crimson/seastore/transaction_manager_test_state: fix compilation error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Introduced in: https://github.com/ceph/ceph/commit/898efa78e2cde90a2bdf8e6f7eda1d4def736705 Followup: https://github.com/ceph/ceph/pull/53433 ``` FAILED: src/crimson/tools/CMakeFiles/perf-staged-fltree.dir/perf_staged_fltree.cc.o error: ‘GetParam’ was not declared in this scope 287 | if (std::get<1>(GetParam()) == integrity_check_t::FULL_CHECK) { | ^~~~~~~~ /home/yogisha/ceph/src/test/crimson/seastore/transaction_manager_test_state.h: In member function ‘virtual seastar::future<> SeaStoreTestState::_init()’: /home/yogisha/ceph/src/test/crimson/seastore/transaction_manager_test_state.h:439:21: error: ‘GetParam’ was not declared in this scope 439 | if (std::get<1>(GetParam()) == integrity_check_t::FULL_CHECK) { | ^~~~~~~~ ``` Signed-off-by: Matan Breizman (cherry picked from commit 8a182dffc1ad2571f53a4990c19cb4a329722101) --- src/test/crimson/seastore/transaction_manager_test_state.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index 054d22cb32371..c88bb15dced3e 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -284,6 +284,7 @@ protected: auto sec_devices = devices->get_secondary_devices(); auto p_dev = devices->get_primary_device(); auto fut = seastar::now(); +#ifdef UNIT_TESTS_BUILT if (std::get<1>(GetParam()) == integrity_check_t::FULL_CHECK) { fut = crimson::common::local_conf().set_val( "seastore_full_integrity_check", "true"); @@ -291,6 +292,7 @@ protected: fut = crimson::common::local_conf().set_val( "seastore_full_integrity_check", "false"); } +#endif tm = make_transaction_manager(p_dev, sec_devices, true); epm = tm->get_epm(); lba_manager = tm->get_lba_manager(); @@ -436,6 +438,7 @@ protected: virtual seastar::future<> _init() final { auto fut = seastar::now(); +#ifdef UNIT_TESTS_BUILT if (std::get<1>(GetParam()) == integrity_check_t::FULL_CHECK) { fut = crimson::common::local_conf().set_val( "seastore_full_integrity_check", "true"); @@ -443,6 +446,7 @@ protected: fut = crimson::common::local_conf().set_val( "seastore_full_integrity_check", "false"); } +#endif seastore = make_test_seastore( std::make_unique(mdstore_state.get_mdstore())); return fut.then([this] { -- 2.39.5