Move testload code into ydb/core

27 files changed, 71 insertions, 71 deletions

diff --git a/ydb/core/CMakeLists.txt b/ydb/core/CMakeLists.txt
index 6050c26ab21..a7134c65db1 100644
--- a/ydb/core/CMakeLists.txt
+++ b/ydb/core/CMakeLists.txt
@@ -30,6 +30,7 @@ add_subdirectory(io_formats)
 add_subdirectory(kesus)
 add_subdirectory(keyvalue)
 add_subdirectory(kqp)
+add_subdirectory(load_test)
 add_subdirectory(metering)
 add_subdirectory(mind)
 add_subdirectory(mon)
diff --git a/ydb/core/base/services/blobstorage_service_id.h b/ydb/core/base/services/blobstorage_service_id.h
index 43f6eceda65..eddc25ebc35 100644
--- a/ydb/core/base/services/blobstorage_service_id.h
+++ b/ydb/core/base/services/blobstorage_service_id.h
@@ -14,8 +14,8 @@ inline TActorId MakeBlobStorageProxyID(ui32 blobStorageGroup) {
     return TActorId(0, TStringBuf(x, 12));
 }
 
-inline TActorId MakeBlobStorageLoadID(ui32 nodeId) {
-    char x[12] = {'b', 's', 'l', 'o', 'a', 'd', 'd', 0};
+inline TActorId MakeLoadServiceID(ui32 nodeId) {
+    char x[12] = {'l', 'o', 'a', 'd', 't', 'e', 's', 't'};
     x[8] = (char)(nodeId >> 24);
     x[9] = (char)(nodeId >> 16);
     x[10] = (char)(nodeId >> 8);
diff --git a/ydb/core/blobstorage/CMakeLists.txt b/ydb/core/blobstorage/CMakeLists.txt
index 77cb7c9da43..01f4e0e06be 100644
--- a/ydb/core/blobstorage/CMakeLists.txt
+++ b/ydb/core/blobstorage/CMakeLists.txt
@@ -18,7 +18,6 @@ add_subdirectory(other)
 add_subdirectory(pdisk)
 add_subdirectory(storagepoolmon)
 add_subdirectory(testing)
-add_subdirectory(testload)
 add_subdirectory(ut_blobstorage)
 add_subdirectory(ut_group)
 add_subdirectory(ut_mirror3of4)
@@ -44,6 +43,5 @@ target_link_libraries(ydb-core-blobstorage INTERFACE
   core-blobstorage-other
   core-blobstorage-pdisk
   core-blobstorage-storagepoolmon
-  core-blobstorage-testload
   core-blobstorage-vdisk
 )
diff --git a/ydb/core/blobstorage/testload/CMakeLists.txt b/ydb/core/blobstorage/testload/CMakeLists.txt
deleted file mode 100644
index 6f3a2076fe5..00000000000
--- a/ydb/core/blobstorage/testload/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# This file was gererated 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_library(core-blobstorage-testload)
-target_link_libraries(core-blobstorage-testload PUBLIC
-  contrib-libs-cxxsupp
-  yutil
-  cpp-histogram-hdr
-  contrib-libs-protobuf
-  monlib-dynamic_counters-percentile
-  monlib-service-pages
-  ydb-core-base
-  core-blobstorage-backpressure
-  core-blobstorage-base
-  core-blobstorage-pdisk
-  ydb-core-control
-  ydb-core-keyvalue
-  ydb-library-workload
-  public-lib-base
-  public-lib-operation_id
-  cpp-client-ydb_proto
-)
-target_sources(core-blobstorage-testload PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_actor.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_memory.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_write.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/testload/test_load_kqp.cpp
-)
diff --git a/ydb/core/client/server/msgbus_server_load.cpp b/ydb/core/client/server/msgbus_server_load.cpp
index 1d96b34fe08..3dff97bc889 100644
--- a/ydb/core/client/server/msgbus_server_load.cpp
+++ b/ydb/core/client/server/msgbus_server_load.cpp
@@ -1,5 +1,5 @@
 #include "msgbus_servicereq.h"
-#include <ydb/core/blobstorage/testload/test_load_events.h>
+#include <ydb/core/load_test/events.h>
 
 namespace NKikimr {
 namespace NMsgBusProxy {
@@ -27,7 +27,7 @@ public:
             auto msg = MakeHolder<TEvLoad::TEvTestLoadRequest>();
             msg->Record = Cmd;
             msg->Record.SetCookie(nodeId);
-            ctx.Send(MakeBlobStorageLoadID(nodeId), msg.Release());
+            ctx.Send(MakeLoadServiceID(nodeId), msg.Release());
             ++ResponsesPending;
         }
         TVector<ui32>().swap(NodeIds);
diff --git a/ydb/core/driver_lib/run/CMakeLists.txt b/ydb/core/driver_lib/run/CMakeLists.txt
index a50ca574b5a..b0651ad7c3e 100644
--- a/ydb/core/driver_lib/run/CMakeLists.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.txt
@@ -44,7 +44,6 @@ target_link_libraries(run PUBLIC
   core-blobstorage-nodewarden
   core-blobstorage-other
   core-blobstorage-pdisk
-  core-blobstorage-testload
   blobstorage-vdisk-common
   core-client-minikql_compile
   core-client-scheme_cache_lib
@@ -65,6 +64,7 @@ target_link_libraries(run PUBLIC
   ydb-core-keyvalue
   ydb-core-kqp
   core-kqp-rm_service
+  ydb-core-load_test
   ydb-core-metering
   ydb-core-mind
   core-mind-address_classification
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index a7913db7070..fbb9ee6c822 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -27,7 +27,6 @@
 #include <ydb/core/blobstorage/backpressure/unisched.h>
 #include <ydb/core/blobstorage/nodewarden/node_warden.h>
 #include <ydb/core/blobstorage/other/mon_get_blob_page.h>
-#include <ydb/core/blobstorage/testload/test_load_actor.h>
 #include <ydb/core/blobstorage/vdisk/common/blobstorage_event_filter.h>
 
 #include <ydb/core/client/minikql_compile/mkql_compile_service.h>
@@ -66,6 +65,8 @@
 #include <ydb/core/kqp/proxy_service/kqp_proxy_service.h>
 #include <ydb/core/kqp/rm_service/kqp_rm_service.h>
 
+#include <ydb/core/load_test/service_actor.h>
+
 #include <ydb/core/metering/metering.h>
 
 #include <ydb/core/mind/address_classification/net_classifier.h>
@@ -1855,7 +1856,7 @@ TLoadInitializer::TLoadInitializer(const TKikimrRunConfig& runConfig)
 
 void TLoadInitializer::InitializeServices(NActors::TActorSystemSetup *setup, const NKikimr::TAppData *appData) {
     IActor *bsActor = CreateTestLoadActor(appData->Counters);
-    setup->LocalServices.emplace_back(MakeBlobStorageLoadID(NodeId), TActorSetupCmd(bsActor, TMailboxType::HTSwap, appData->UserPoolId));
+    setup->LocalServices.emplace_back(MakeLoadServiceID(NodeId), TActorSetupCmd(bsActor, TMailboxType::HTSwap, appData->UserPoolId));
     // FIXME: correct service id
 
     IActor *dsActor = NDataShardLoad::CreateTestLoadActor(appData->Counters);
diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 05260ee8446..9519d268226 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -1206,7 +1206,7 @@ void TKikimrRunner::InitializeActorSystem(
                 "Load",
                 false,
                 ActorSystem.Get(),
-                MakeBlobStorageLoadID(runConfig.NodeId));
+                MakeLoadServiceID(runConfig.NodeId));
 
             Monitoring->RegisterActorPage(
                 ActorsMonPage,
diff --git a/ydb/core/load_test/CMakeLists.txt b/ydb/core/load_test/CMakeLists.txt
new file mode 100644
index 00000000000..277614cd619
--- /dev/null
+++ b/ydb/core/load_test/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+# This file was gererated 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_library(ydb-core-load_test)
+target_link_libraries(ydb-core-load_test PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  cpp-histogram-hdr
+  contrib-libs-protobuf
+  monlib-dynamic_counters-percentile
+  monlib-service-pages
+  ydb-core-base
+  core-blobstorage-backpressure
+  core-blobstorage-base
+  core-blobstorage-pdisk
+  ydb-core-control
+  ydb-core-keyvalue
+  ydb-library-workload
+  public-lib-base
+  public-lib-operation_id
+  cpp-client-ydb_proto
+)
+target_sources(ydb-core-load_test PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/service_actor.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/keyvalue_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/memory.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_read.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/pdisk_log.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/vdisk_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/group_write.cpp
+  ${CMAKE_SOURCE_DIR}/ydb/core/load_test/kqp.cpp
+)
diff --git a/ydb/core/blobstorage/testload/defs.h b/ydb/core/load_test/defs.h
index c4777edcc1a..a413c00f7aa 100644
--- a/ydb/core/blobstorage/testload/defs.h
+++ b/ydb/core/load_test/defs.h
@@ -1,5 +1,5 @@
 #pragma once
-// unique tag to fix pragma once gcc glueing: ./ydb/core/blobstorage/testload/defs.h
+// unique tag to fix pragma once gcc glueing: ./ydb/core/load_test/defs.h
 #include <ydb/core/base/defs.h>
 #include <ydb/core/base/logoblob.h>
 #include <library/cpp/actors/core/event_local.h>
@@ -8,4 +8,4 @@
 #include <ydb/core/protos/services.pb.h>
 #include <ydb/core/protos/testload.pb.h>
 
-#include <ydb/core/blobstorage/testload/test_load_events.h>
+#include <ydb/core/load_test/events.h>
diff --git a/ydb/core/blobstorage/testload/test_load_events.h b/ydb/core/load_test/events.h
index 15a7e0cca70..15a7e0cca70 100644
--- a/ydb/core/blobstorage/testload/test_load_events.h
+++ b/ydb/core/load_test/events.h
diff --git a/ydb/core/blobstorage/testload/test_load_gen.h b/ydb/core/load_test/gen.h
index 823ce9daf78..823ce9daf78 100644
--- a/ydb/core/blobstorage/testload/test_load_gen.h
+++ b/ydb/core/load_test/gen.h
diff --git a/ydb/core/blobstorage/testload/test_load_write.cpp b/ydb/core/load_test/group_write.cpp
index b29e3310010..266c195c57e 100644
--- a/ydb/core/blobstorage/testload/test_load_write.cpp
+++ b/ydb/core/load_test/group_write.cpp
@@ -1,8 +1,8 @@
-#include "test_load_actor.h"
-#include "test_load_size_gen.h"
-#include "test_load_interval_gen.h"
-#include "test_load_quantile.h"
-#include "test_load_speed.h"
+#include "service_actor.h"
+#include "size_gen.h"
+#include "interval_gen.h"
+#include "quantile.h"
+#include "speed.h"
 
 #include <ydb/core/util/yverify_stream.h>
 #include <ydb/core/util/lz4_data_generator.h>
diff --git a/ydb/core/blobstorage/testload/test_load_interval_gen.h b/ydb/core/load_test/interval_gen.h
index 13354c7eade..c2e47de04db 100644
--- a/ydb/core/blobstorage/testload/test_load_interval_gen.h
+++ b/ydb/core/load_test/interval_gen.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include "test_load_gen.h"
+#include "gen.h"
 #include <ydb/core/protos/testload.pb.h>
 #include <util/generic/variant.h>
 
diff --git a/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp b/ydb/core/load_test/keyvalue_write.cpp
index 190bbd48f3d..d45fe4d8d17 100644
--- a/ydb/core/blobstorage/testload/test_load_keyvalue_write.cpp
+++ b/ydb/core/load_test/keyvalue_write.cpp
@@ -1,5 +1,5 @@
 #include <util/random/shuffle.h>
-#include "test_load_actor.h"
+#include "service_actor.h"
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/tablet_pipe.h>
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h>
diff --git a/ydb/core/blobstorage/testload/test_load_kqp.cpp b/ydb/core/load_test/kqp.cpp
index b132abfd2ca..66bddc8cc5e 100644
--- a/ydb/core/blobstorage/testload/test_load_kqp.cpp
+++ b/ydb/core/load_test/kqp.cpp
@@ -1,4 +1,4 @@
-#include "test_load_actor.h"
+#include "service_actor.h"
 
 #include <ydb/core/base/counters.h>
 #include <ydb/core/base/tablet_pipe.h>
diff --git a/ydb/core/blobstorage/testload/test_load_memory.cpp b/ydb/core/load_test/memory.cpp
index b1dc652c6ee..88ff01c0914 100644
--- a/ydb/core/blobstorage/testload/test_load_memory.cpp
+++ b/ydb/core/load_test/memory.cpp
@@ -1,4 +1,4 @@
-#include "test_load_actor.h"
+#include "service_actor.h"
 
 #include <ydb/core/base/appdata.h>
 
diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp b/ydb/core/load_test/pdisk_log.cpp
index d93efb2fc74..b110dfa5845 100644
--- a/ydb/core/blobstorage/testload/test_load_pdisk_log.cpp
+++ b/ydb/core/load_test/pdisk_log.cpp
@@ -1,5 +1,5 @@
 #include <util/random/shuffle.h>
-#include "test_load_actor.h"
+#include "service_actor.h"
 #include <ydb/core/base/counters.h>
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h>
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp b/ydb/core/load_test/pdisk_read.cpp
index e360317193a..7d2901cb13b 100644
--- a/ydb/core/blobstorage/testload/test_load_pdisk_read.cpp
+++ b/ydb/core/load_test/pdisk_read.cpp
@@ -1,4 +1,4 @@
-#include "test_load_actor.h"
+#include "service_actor.h"
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
 #include <ydb/core/control/immediate_control_board_wrapper.h>
diff --git a/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp b/ydb/core/load_test/pdisk_write.cpp
index 8060a4ca993..8678a3344a0 100644
--- a/ydb/core/blobstorage/testload/test_load_pdisk_write.cpp
+++ b/ydb/core/load_test/pdisk_write.cpp
@@ -1,5 +1,5 @@
 #include <util/random/shuffle.h>
-#include "test_load_actor.h"
+#include "service_actor.h"
 #include <ydb/core/base/counters.h>
 #include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h>
 #include <ydb/core/blobstorage/base/blobstorage_events.h>
diff --git a/ydb/core/blobstorage/testload/test_load_quantile.h b/ydb/core/load_test/quantile.h
index 11b14aed5d7..8f403a727b9 100644
--- a/ydb/core/blobstorage/testload/test_load_quantile.h
+++ b/ydb/core/load_test/quantile.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include "test_load_time_series.h"
+#include "time_series.h"
 
 #include <library/cpp/monlib/dynamic_counters/counters.h>
 
diff --git a/ydb/core/blobstorage/testload/test_load_actor.cpp b/ydb/core/load_test/service_actor.cpp
index bca11f8ea41..2cbd0221922 100644
--- a/ydb/core/blobstorage/testload/test_load_actor.cpp
+++ b/ydb/core/load_test/service_actor.cpp
@@ -1,4 +1,4 @@
-#include "test_load_actor.h"
+#include "service_actor.h"
 
 #include <ydb/core/base/appdata.h>
 #include <ydb/core/base/counters.h>
@@ -401,7 +401,7 @@ public:
                 auto msg = MakeHolder<TEvLoad::TEvTestLoadRequest>();
                 msg->Record = cmd;
                 msg->Record.SetCookie(id);
-                ctx.Send(MakeBlobStorageLoadID(id), msg.Release());
+                ctx.Send(MakeLoadServiceID(id), msg.Release());
             }
         }
 
diff --git a/ydb/core/blobstorage/testload/test_load_actor.h b/ydb/core/load_test/service_actor.h
index 5c91a5ab4a4..5c91a5ab4a4 100644
--- a/ydb/core/blobstorage/testload/test_load_actor.h
+++ b/ydb/core/load_test/service_actor.h
diff --git a/ydb/core/blobstorage/testload/test_load_size_gen.h b/ydb/core/load_test/size_gen.h
index 4676d10ae92..8c1aa943c8a 100644
--- a/ydb/core/blobstorage/testload/test_load_size_gen.h
+++ b/ydb/core/load_test/size_gen.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include "test_load_gen.h"
+#include "gen.h"
 #include <ydb/core/protos/blobstorage.pb.h>
 
 namespace NKikimr {
diff --git a/ydb/core/blobstorage/testload/test_load_speed.h b/ydb/core/load_test/speed.h
index edc6e8a8f62..9739648a38b 100644
--- a/ydb/core/blobstorage/testload/test_load_speed.h
+++ b/ydb/core/load_test/speed.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "defs.h"
-#include "test_load_time_series.h"
+#include "time_series.h"
 
 namespace NKikimr {
 
diff --git a/ydb/core/blobstorage/testload/test_load_time_series.h b/ydb/core/load_test/time_series.h
index b1ccfd037ad..b1ccfd037ad 100644
--- a/ydb/core/blobstorage/testload/test_load_time_series.h
+++ b/ydb/core/load_test/time_series.h
diff --git a/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp b/ydb/core/load_test/vdisk_write.cpp
index 8275b566238..de06533b008 100644
--- a/ydb/core/blobstorage/testload/test_load_vdisk_write.cpp
+++ b/ydb/core/load_test/vdisk_write.cpp
@@ -1,6 +1,6 @@
-#include "test_load_actor.h"
-#include "test_load_interval_gen.h"
-#include "test_load_size_gen.h"
+#include "service_actor.h"
+#include "interval_gen.h"
+#include "size_gen.h"
 #include <ydb/core/blobstorage/base/blobstorage_vdiskid.h>
 #include <ydb/core/blobstorage/vdisk/common/vdisk_events.h>
 #include <ydb/core/blobstorage/backpressure/queue_backpressure_client.h>