Remove node identifier (deprecated)

Also free IO pool from this unneeded actor. KIKIMR-20497
ydb-platform · Dec 25, 2023 · c8e7e8a · c8e7e8a
1 parent 5c26443
commit c8e7e8a
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 212 deletions.
diff --git a/ydb/core/actorlib_impl/CMakeLists.darwin-arm64.txt b/ydb/core/actorlib_impl/CMakeLists.darwin-arm64.txt
@@ -44,7 +44,6 @@ target_sources(ydb-core-actorlib_impl PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/mad_squirrel.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/melancholic_gopher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/name_service_client_protocol.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/node_identifier.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_data_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_http_reply_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/send_data_protocol.cpp

diff --git a/ydb/core/actorlib_impl/CMakeLists.darwin-x86_64.txt b/ydb/core/actorlib_impl/CMakeLists.darwin-x86_64.txt
@@ -44,7 +44,6 @@ target_sources(ydb-core-actorlib_impl PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/mad_squirrel.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/melancholic_gopher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/name_service_client_protocol.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/node_identifier.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_data_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_http_reply_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/send_data_protocol.cpp

diff --git a/ydb/core/actorlib_impl/CMakeLists.linux-aarch64.txt b/ydb/core/actorlib_impl/CMakeLists.linux-aarch64.txt
@@ -45,7 +45,6 @@ target_sources(ydb-core-actorlib_impl PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/mad_squirrel.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/melancholic_gopher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/name_service_client_protocol.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/node_identifier.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_data_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_http_reply_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/send_data_protocol.cpp

diff --git a/ydb/core/actorlib_impl/CMakeLists.linux-x86_64.txt b/ydb/core/actorlib_impl/CMakeLists.linux-x86_64.txt
@@ -45,7 +45,6 @@ target_sources(ydb-core-actorlib_impl PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/mad_squirrel.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/melancholic_gopher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/name_service_client_protocol.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/node_identifier.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_data_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_http_reply_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/send_data_protocol.cpp

diff --git a/ydb/core/actorlib_impl/CMakeLists.windows-x86_64.txt b/ydb/core/actorlib_impl/CMakeLists.windows-x86_64.txt
@@ -44,7 +44,6 @@ target_sources(ydb-core-actorlib_impl PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/mad_squirrel.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/melancholic_gopher.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/name_service_client_protocol.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/node_identifier.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_data_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/read_http_reply_protocol.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/actorlib_impl/send_data_protocol.cpp

diff --git a/ydb/core/actorlib_impl/node_identifier.cpp b/ydb/core/actorlib_impl/node_identifier.cpp
diff --git a/ydb/core/actorlib_impl/node_identifier.h b/ydb/core/actorlib_impl/node_identifier.h
diff --git a/ydb/core/actorlib_impl/ya.make b/ydb/core/actorlib_impl/ya.make
@@ -18,8 +18,6 @@ SRCS(
     melancholic_gopher.cpp
     name_service_client_protocol.cpp
     name_service_client_protocol.h
-    node_identifier.cpp
-    node_identifier.h
     proto_ready_actor.h
     read_data_protocol.cpp
     read_data_protocol.h

diff --git a/ydb/core/driver_lib/run/config.h b/ydb/core/driver_lib/run/config.h
@@ -44,7 +44,7 @@ union TBasicKikimrServicesMask {
         bool EnableKqp:1;
         bool EnableMemoryLog:1;
         bool EnableGRpcService:1;
-        bool EnableNodeIdentifier:1;
+        bool UNUSED_EnableNodeIdentifier:1;
         bool EnableCms:1;
         bool EnableNodeTable:1;
         bool EnableGRpcProxyStatus:1;

diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -6,7 +6,6 @@
 #include <ydb/core/actorlib_impl/destruct_actor.h>
 #include <ydb/core/actorlib_impl/load_network.h>
 #include <ydb/core/actorlib_impl/mad_squirrel.h>
-#include <ydb/core/actorlib_impl/node_identifier.h>
 
 #include "ydb/core/audit/audit_log.h"
 
@@ -1804,21 +1803,6 @@ void TWhiteBoardServiceInitializer::InitializeServices(NActors::TActorSystemSetu
                                                                                       appData->SystemPoolId)));
 }
 
-// TNodeIdentifierInitializer
-
-TNodeIdentifierInitializer::TNodeIdentifierInitializer(const TKikimrRunConfig& runConfig)
-    : IKikimrServicesInitializer(runConfig) {
-}
-
-void TNodeIdentifierInitializer::InitializeServices(NActors::TActorSystemSetup* setup,
-                                                    const NKikimr::TAppData* appData) {
-    IActor* nodeIdentifier = CreateNodeIdentifier();
-    setup->LocalServices.push_back(std::pair<TActorId, TActorSetupCmd>(MakeNodeIdentifierServiceId(),
-                                                                       TActorSetupCmd(nodeIdentifier,
-                                                                                      TMailboxType::Simple,
-                                                                                      appData->IOPoolId)));
-}
-
 // TTabletMonitorInitializer
 
 TTabletMonitorInitializer::TTabletMonitorInitializer(

diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.h b/ydb/core/driver_lib/run/kikimr_services_initializers.h
@@ -289,13 +289,6 @@ class TWhiteBoardServiceInitializer : public IKikimrServicesInitializer {
     void InitializeServices(NActors::TActorSystemSetup *setup, const NKikimr::TAppData *appData) override;
 };
 
-class TNodeIdentifierInitializer : public IKikimrServicesInitializer {
-public:
-    TNodeIdentifierInitializer(const TKikimrRunConfig& runConfig);
-
-    void InitializeServices(NActors::TActorSystemSetup *setup, const NKikimr::TAppData *appData) override;
-};
-
 class TTabletMonitorInitializer : public IKikimrServicesInitializer {
     TIntrusivePtr<NNodeTabletMonitor::ITabletStateClassifier> TabletStateClassifier;
     TIntrusivePtr<NNodeTabletMonitor::ITabletListRenderer> TabletListRenderer;

diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
@@ -1383,9 +1383,6 @@ TIntrusivePtr<TServiceInitializersList> TKikimrRunner::CreateServiceInitializers
     if (serviceMask.EnableWhiteBoard) {
         sil->AddServiceInitializer(new TWhiteBoardServiceInitializer(runConfig));
     }
-    if (serviceMask.EnableNodeIdentifier) {
-        sil->AddServiceInitializer(new TNodeIdentifierInitializer(runConfig));
-    }
     if (serviceMask.EnableBSNodeWarden) {
         sil->AddServiceInitializer(new TBSNodeWardenInitializer(runConfig));
     }