Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove node identifier (deprecated) #688

Merged
merged 1 commit into from
Dec 27, 2023
Merged

Remove node identifier (deprecated) #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ydb/core/actorlib_impl/CMakeLists.darwin-arm64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ydb/core/actorlib_impl/CMakeLists.darwin-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ydb/core/actorlib_impl/CMakeLists.linux-aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ydb/core/actorlib_impl/CMakeLists.linux-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion ydb/core/actorlib_impl/CMakeLists.windows-x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
165 changes: 0 additions & 165 deletions ydb/core/actorlib_impl/node_identifier.cpp
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ydb/core/actorlib_impl/node_identifier.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ydb/core/actorlib_impl/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/driver_lib/run/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 0 additions & 16 deletions ydb/core/driver_lib/run/kikimr_services_initializers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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(
Expand Down
7 changes: 0 additions & 7 deletions ydb/core/driver_lib/run/kikimr_services_initializers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions ydb/core/driver_lib/run/run.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
Loading