From 69deef49bf628c34808033c3cd9d1b11e72a758f Mon Sep 17 00:00:00 2001 From: Kirill Pleshivtsev Date: Tue, 30 Jan 2024 20:13:04 +0700 Subject: [PATCH] NBS-4827 fix CMake files --- .../CMakeLists.darwin-x86_64.txt | 15 ++++++++------- .../CMakeLists.linux-aarch64.txt | 13 +++++++------ .../partition_nonrepl/CMakeLists.linux-x86_64.txt | 13 +++++++------ .../CMakeLists.windows-x86_64.txt | 13 +++++++------ .../ut/CMakeLists.darwin-x86_64.txt | 2 +- .../ut/CMakeLists.linux-aarch64.txt | 2 +- .../ut/CMakeLists.linux-x86_64.txt | 2 +- .../ut/CMakeLists.windows-x86_64.txt | 2 +- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.darwin-x86_64.txt index fa2d93fcd51..efbcb281a88 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.darwin-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.darwin-x86_64.txt @@ -34,6 +34,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp @@ -69,10 +70,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp -) + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp + ) diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-aarch64.txt index 39f8a1fd33b..549b5e95675 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-aarch64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-aarch64.txt @@ -35,6 +35,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp @@ -70,10 +71,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp ) diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-x86_64.txt index 39f8a1fd33b..549b5e95675 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.linux-x86_64.txt @@ -35,6 +35,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp @@ -70,10 +71,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp ) diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.windows-x86_64.txt index fa2d93fcd51..41886b989eb 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.windows-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/CMakeLists.windows-x86_64.txt @@ -34,6 +34,7 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/copy_range.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/replica_info.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/resync_range.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/mirror_request_actor.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_actor.cpp @@ -69,10 +70,10 @@ target_sources(libs-storage-partition_nonrepl PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_actor_zeroblocks.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_migration.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_mirror.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_readblocks_local.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_actor_stats.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_migration.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_mirror.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_readblocks_local.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_common_actor_stats.cpp ) diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.darwin-x86_64.txt index 320f8413d7f..90343c821a6 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.darwin-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.darwin-x86_64.txt @@ -34,7 +34,7 @@ target_sources(blockstore-libs-storage-partition_nonrepl-ut PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_state_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_common_ut.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state_ut.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_ut.cpp diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-aarch64.txt index 8a2686d18d7..d5079bc843e 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-aarch64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-aarch64.txt @@ -37,7 +37,7 @@ target_sources(blockstore-libs-storage-partition_nonrepl-ut PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_state_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_common_ut.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state_ut.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_ut.cpp diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-x86_64.txt index 881cff4377f..8e874924365 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.linux-x86_64.txt @@ -38,7 +38,7 @@ target_sources(blockstore-libs-storage-partition_nonrepl-ut PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_state_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_common_ut.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state_ut.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_ut.cpp diff --git a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.windows-x86_64.txt index 2e5d21ce6f3..873c477dc9b 100644 --- a/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.windows-x86_64.txt +++ b/cloud/blockstore/libs/storage/partition_nonrepl/ut/CMakeLists.windows-x86_64.txt @@ -27,7 +27,7 @@ target_sources(blockstore-libs-storage-partition_nonrepl-ut PRIVATE ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_state_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_mirror_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_common_ut.cpp - ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_state_ut.cpp + ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/migration_timeout_calculator_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_migration_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_rdma_ut.cpp ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/partition_nonrepl/part_nonrepl_ut.cpp