From afdafee74c5d7af89353f903cfd551f6f5defa2b Mon Sep 17 00:00:00 2001 From: Jenkins Build Slave User Date: Fri, 19 Mar 2021 08:32:59 +0000 Subject: [PATCH] cmake: use --smp 1 --memory 256M to crimson tests to reduce the resource usage when running tests there is an exception though, as we want to test test_config.cc with multiple reactors. Signed-off-by: Kefu Chai --- src/test/crimson/CMakeLists.txt | 13 ++++++----- src/test/crimson/seastore/CMakeLists.txt | 22 ++++++++++++------- .../seastore/onode_tree/CMakeLists.txt | 6 +++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/test/crimson/CMakeLists.txt b/src/test/crimson/CMakeLists.txt index b5120cd87ef..d6abfa64d0b 100644 --- a/src/test/crimson/CMakeLists.txt +++ b/src/test/crimson/CMakeLists.txt @@ -4,7 +4,8 @@ add_executable(unittest-crimson-backfill ${PROJECT_SOURCE_DIR}/src/auth/Crypto.cc ${PROJECT_SOURCE_DIR}/src/crimson/osd/backfill_state.cc ${PROJECT_SOURCE_DIR}/src/osd/recovery_types.cc) -add_ceph_unittest(unittest-crimson-backfill) +add_ceph_unittest(unittest-crimson-backfill + unittest-crimson-backfill --memory 256M --smp 1) target_link_libraries(unittest-crimson-backfill crimson GTest::Main) add_executable(unittest-seastar-buffer @@ -15,7 +16,7 @@ target_link_libraries(unittest-seastar-buffer crimson) add_executable(unittest-seastar-denc test_denc.cc) -add_ceph_unittest(unittest-seastar-denc) +add_ceph_unittest(unittest-seastar-denc --memory 256M --smp 1) target_link_libraries(unittest-seastar-denc crimson GTest::Main) add_executable(unittest-seastar-socket test_socket.cc) @@ -50,7 +51,7 @@ target_link_libraries(unittest-seastar-alienstore-thread-pool add_executable(unittest-seastar-config test_config.cc) add_ceph_test(unittest-seastar-config - unittest-seastar-config --memory 256M) + unittest-seastar-config --memory 256M --smp 4) target_link_libraries(unittest-seastar-config crimson) add_executable(unittest-seastar-monc @@ -75,7 +76,8 @@ add_ceph_unittest(unittest-fixed-kv-node-layout) add_executable(unittest_interruptible_future test_interruptible_future.cc gtest_seastar.cc) -add_ceph_unittest(unittest_interruptible_future) +add_ceph_unittest(unittest_interruptible_future + unittest_interruptible_future --memory 256M --smp 1) target_link_libraries( unittest_interruptible_future crimson-common) @@ -92,4 +94,5 @@ add_executable(unittest-seastar-errorator target_link_libraries( unittest-seastar-errorator crimson::gtest) -add_ceph_unittest(unittest-seastar-errorator) +add_ceph_unittest(unittest-seastar-errorator + unittest-seastar-errorator --memory 256M --smp 1) diff --git a/src/test/crimson/seastore/CMakeLists.txt b/src/test/crimson/seastore/CMakeLists.txt index 7155704a4bc..28ad5a67f85 100644 --- a/src/test/crimson/seastore/CMakeLists.txt +++ b/src/test/crimson/seastore/CMakeLists.txt @@ -2,7 +2,8 @@ add_executable(unittest-transaction-manager test_block.cc test_transaction_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-transaction-manager) +add_ceph_unittest(unittest-transaction-manager + unittest-seastar-socket --memory 256M --smp 1) target_link_libraries( unittest-transaction-manager ${CMAKE_DL_LIBS} @@ -11,7 +12,8 @@ target_link_libraries( add_executable(unittest-btree-lba-manager test_btree_lba_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-btree-lba-manager) +add_ceph_unittest(unittest-btree-lba-manager + unittest-btree-lba-manager --memory 256M --smp 1) target_link_libraries( unittest-btree-lba-manager ${CMAKE_DL_LIBS} @@ -20,7 +22,7 @@ target_link_libraries( add_executable(unittest-seastore-journal test_seastore_journal.cc) add_ceph_test(unittest-seastore-journal - unittest-seastore-journal) + unittest-seastore-journal --memory 256M --smp 1) target_link_libraries( unittest-seastore-journal crimson::gtest @@ -30,7 +32,7 @@ add_executable(unittest-seastore-cache test_block.cc test_seastore_cache.cc) add_ceph_test(unittest-seastore-cache - unittest-seastore-cache) + unittest-seastore-cache --memory 256M --smp 1) target_link_libraries( unittest-seastore-cache crimson::gtest @@ -39,7 +41,8 @@ target_link_libraries( add_executable(unittest-extmap-manager test_extmap_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-extmap-manager) +add_ceph_unittest(unittest-extmap-manager + unittest-extmap-manager --memory 256M --smp 1) target_link_libraries( unittest-extmap-manager crimson::gtest @@ -50,7 +53,8 @@ target_link_libraries( add_executable(unittest-collection-manager test_collection_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-collection-manager) +add_ceph_unittest(unittest-collection-manager + unittest-collection-manager --memory 256M --smp 1) target_link_libraries( unittest-collection-manager crimson::gtest @@ -61,7 +65,8 @@ target_link_libraries( add_executable(unittest-omap-manager test_omap_manager.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-omap-manager) +add_ceph_unittest(unittest-omap-manager + unittest-omap-manager --memory 256M --smp 1) target_link_libraries( unittest-omap-manager ${CMAKE_DL_LIBS} @@ -70,7 +75,8 @@ target_link_libraries( add_executable(unittest-seastore test_seastore.cc ../gtest_seastar.cc) -add_ceph_unittest(unittest-seastore) +add_ceph_unittest(unittest-seastore + unittest-seastore --memory 256M --smp 1) target_link_libraries( unittest-seastore ${CMAKE_DL_LIBS} diff --git a/src/test/crimson/seastore/onode_tree/CMakeLists.txt b/src/test/crimson/seastore/onode_tree/CMakeLists.txt index 632e16b7035..1512e9008a2 100644 --- a/src/test/crimson/seastore/onode_tree/CMakeLists.txt +++ b/src/test/crimson/seastore/onode_tree/CMakeLists.txt @@ -1,13 +1,15 @@ add_executable(unittest-staged-fltree test_staged_fltree.cc ../../gtest_seastar.cc) -add_ceph_unittest(unittest-staged-fltree) +add_ceph_unittest(unittest-staged-fltree + unittest-staged-fltree --memory 256M --smp 1) target_link_libraries(unittest-staged-fltree crimson-seastore) add_executable(unittest-fltree-onode-manager test_fltree_onode_manager.cc ../../gtest_seastar.cc) -add_ceph_unittest(unittest-fltree-onode-manager) +add_ceph_unittest(unittest-fltree-onode-manager + unittest-fltree-onode-manager --memory 256M --smp 1) target_link_libraries(unittest-fltree-onode-manager crimson-seastore) -- 2.39.5