merge to stable-23-3 (#854)

* #845 * #183 * #811
ydb-platform · Apr 2, 2024 · 7a35a1d · 7a35a1d
1 parent ed761da
commit 7a35a1d
Show file tree

Hide file tree

Showing 34 changed files with 578 additions and 893 deletions.
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.darwin-x86_64.txt
@@ -5,6 +5,7 @@
 # ya.make files by maintainers. Any complex modifications which can't be ported back to the
 # original buildsystem will not be accepted.
 
+add_subdirectory(ut)
 
 add_library(storage-disk_agent-actors)
 target_link_libraries(storage-disk_agent-actors PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-aarch64.txt
@@ -5,6 +5,7 @@
 # ya.make files by maintainers. Any complex modifications which can't be ported back to the
 # original buildsystem will not be accepted.
 
+add_subdirectory(ut)
 
 add_library(storage-disk_agent-actors)
 target_link_libraries(storage-disk_agent-actors PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/CMakeLists.linux-x86_64.txt
@@ -6,6 +6,8 @@
 # original buildsystem will not be accepted.
 
 
+add_subdirectory(ut)
+
 add_library(storage-disk_agent-actors)
 target_link_libraries(storage-disk_agent-actors PUBLIC
   contrib-libs-linux-headers

diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.darwin-x86_64.txt
@@ -0,0 +1,82 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(cloud-blockstore-libs-storage-disk_agent-actors-ut)
+target_include_directories(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent
+)
+target_link_libraries(cloud-blockstore-libs-storage-disk_agent-actors-ut PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  libs-storage-disk_agent
+  libs-storage-api
+  libs-storage-core
+  storage-disk_agent-testlib
+  cpp-actors-core
+  cpp-testing-gmock_in_unittest
+  cpp-testing-unittest
+  ydb-core-testlib
+  core-testlib-basics
+)
+target_link_options(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  -Wl,-platform_version,macos,11.0,11.0
+  -fPIC
+  -fPIC
+  -framework
+  CoreFoundation
+)
+target_sources(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor_ut.cpp
+)
+set_property(
+  TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  SPLIT_FACTOR
+  15
+)
+add_yunittest(
+  NAME
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  LABELS
+  SMALL
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  PROCESSORS
+  2
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  TIMEOUT
+  60
+)
+target_allocator(cloud-blockstore-libs-storage-disk_agent-actors-ut
+  system_allocator
+)
+vcs_info(cloud-blockstore-libs-storage-disk_agent-actors-ut)
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.linux-aarch64.txt
@@ -0,0 +1,85 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(cloud-blockstore-libs-storage-disk_agent-actors-ut)
+target_include_directories(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent
+)
+target_link_libraries(cloud-blockstore-libs-storage-disk_agent-actors-ut PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  cpp-testing-unittest_main
+  libs-storage-disk_agent
+  libs-storage-api
+  libs-storage-core
+  storage-disk_agent-testlib
+  cpp-actors-core
+  cpp-testing-gmock_in_unittest
+  cpp-testing-unittest
+  ydb-core-testlib
+  core-testlib-basics
+)
+target_link_options(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor_ut.cpp
+)
+set_property(
+  TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  SPLIT_FACTOR
+  15
+)
+add_yunittest(
+  NAME
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  LABELS
+  SMALL
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  PROCESSORS
+  2
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  TIMEOUT
+  60
+)
+target_allocator(cloud-blockstore-libs-storage-disk_agent-actors-ut
+  cpp-malloc-jemalloc
+)
+vcs_info(cloud-blockstore-libs-storage-disk_agent-actors-ut)
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.linux-x86_64.txt
@@ -0,0 +1,87 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+
+add_executable(cloud-blockstore-libs-storage-disk_agent-actors-ut)
+target_include_directories(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent
+)
+target_link_libraries(cloud-blockstore-libs-storage-disk_agent-actors-ut PUBLIC
+  contrib-libs-linux-headers
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  libs-storage-disk_agent
+  libs-storage-api
+  libs-storage-core
+  storage-disk_agent-testlib
+  cpp-actors-core
+  cpp-testing-gmock_in_unittest
+  cpp-testing-unittest
+  ydb-core-testlib
+  core-testlib-basics
+)
+target_link_options(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  -ldl
+  -lrt
+  -Wl,--no-as-needed
+  -fPIC
+  -fPIC
+  -lpthread
+  -lrt
+  -ldl
+)
+target_sources(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor_ut.cpp
+)
+set_property(
+  TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  SPLIT_FACTOR
+  15
+)
+add_yunittest(
+  NAME
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  LABELS
+  SMALL
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  PROCESSORS
+  2
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  TIMEOUT
+  60
+)
+target_allocator(cloud-blockstore-libs-storage-disk_agent-actors-ut
+  cpp-malloc-tcmalloc
+  libs-tcmalloc-no_percpu_cache
+)
+vcs_info(cloud-blockstore-libs-storage-disk_agent-actors-ut)
diff --git a/...sk_registry/ut_wait_device/CMakeLists.txt → ...orage/disk_agent/actors/ut/CMakeLists.txt b/...sk_registry/ut_wait_device/CMakeLists.txt → ...orage/disk_agent/actors/ut/CMakeLists.txt
diff --git a/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/disk_agent/actors/ut/CMakeLists.windows-x86_64.txt
@@ -0,0 +1,74 @@
+
+# This file was generated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_executable(cloud-blockstore-libs-storage-disk_agent-actors-ut)
+target_include_directories(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent
+)
+target_link_libraries(cloud-blockstore-libs-storage-disk_agent-actors-ut PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  library-cpp-cpuid_check
+  cpp-testing-unittest_main
+  libs-storage-disk_agent
+  libs-storage-api
+  libs-storage-core
+  storage-disk_agent-testlib
+  cpp-actors-core
+  cpp-testing-gmock_in_unittest
+  cpp-testing-unittest
+  ydb-core-testlib
+  core-testlib-basics
+)
+target_sources(cloud-blockstore-libs-storage-disk_agent-actors-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/blockstore/libs/storage/disk_agent/actors/session_cache_actor_ut.cpp
+)
+set_property(
+  TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  SPLIT_FACTOR
+  15
+)
+add_yunittest(
+  NAME
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_TARGET
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  TEST_ARG
+  --print-before-suite
+  --print-before-test
+  --fork-tests
+  --print-times
+  --show-fails
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  LABELS
+  SMALL
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  PROCESSORS
+  2
+)
+set_yunittest_property(
+  TEST
+  cloud-blockstore-libs-storage-disk_agent-actors-ut
+  PROPERTY
+  TIMEOUT
+  60
+)
+target_allocator(cloud-blockstore-libs-storage-disk_agent-actors-ut
+  system_allocator
+)
+vcs_info(cloud-blockstore-libs-storage-disk_agent-actors-ut)
diff --git a/cloud/blockstore/libs/storage/disk_registry/CMakeLists.darwin-x86_64.txt b/cloud/blockstore/libs/storage/disk_registry/CMakeLists.darwin-x86_64.txt
@@ -23,7 +23,6 @@ add_subdirectory(ut_pools)
 add_subdirectory(ut_restore)
 add_subdirectory(ut_session)
 add_subdirectory(ut_suspend)
-add_subdirectory(ut_wait_device)
 
 add_library(libs-storage-disk_registry)
 target_link_libraries(libs-storage-disk_registry PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_registry/CMakeLists.linux-aarch64.txt b/cloud/blockstore/libs/storage/disk_registry/CMakeLists.linux-aarch64.txt
@@ -23,7 +23,6 @@ add_subdirectory(ut_pools)
 add_subdirectory(ut_restore)
 add_subdirectory(ut_session)
 add_subdirectory(ut_suspend)
-add_subdirectory(ut_wait_device)
 
 add_library(libs-storage-disk_registry)
 target_link_libraries(libs-storage-disk_registry PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_registry/CMakeLists.linux-x86_64.txt b/cloud/blockstore/libs/storage/disk_registry/CMakeLists.linux-x86_64.txt
@@ -23,7 +23,6 @@ add_subdirectory(ut_pools)
 add_subdirectory(ut_restore)
 add_subdirectory(ut_session)
 add_subdirectory(ut_suspend)
-add_subdirectory(ut_wait_device)
 
 add_library(libs-storage-disk_registry)
 target_link_libraries(libs-storage-disk_registry PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_registry/CMakeLists.windows-x86_64.txt b/cloud/blockstore/libs/storage/disk_registry/CMakeLists.windows-x86_64.txt
@@ -23,7 +23,6 @@ add_subdirectory(ut_pools)
 add_subdirectory(ut_restore)
 add_subdirectory(ut_session)
 add_subdirectory(ut_suspend)
-add_subdirectory(ut_wait_device)
 
 add_library(libs-storage-disk_registry)
 target_link_libraries(libs-storage-disk_registry PUBLIC

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp
@@ -186,8 +186,6 @@ void TDiskRegistryActor::BeforeDie(const NActors::TActorContext& ctx)
             MakeError(E_REJECTED, "Tablet is dead"));
     }
     PendingDiskDeallocationRequests.clear();
-
-    CancelAllPendingWaitForDeviceCleanupRequests(ctx);
 }
 
 void TDiskRegistryActor::OnDetach(const TActorContext& ctx)