Skip to content

Commit 183361a

Browse files
kardymondskardymonds
authored
YQ / Revert "Grpc monitoring merge (#11224)" / to stable (#11320)
1 parent c932f6d commit 183361a

File tree

5 files changed

+28
-54
lines changed

5 files changed

+28
-54
lines changed

‎ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <ydb/library/security/ydb_credentials_provider_factory.h>
1212

1313
#include <ydb/public/lib/fq/scope.h>
14-
#include <ydb/public/sdk/cpp/client/resources/ydb_resources.h>
1514
#include <ydb/public/sdk/cpp/client/ydb_query/client.h>
1615
#include <ydb/public/sdk/cpp/client/ydb_operation/operation.h>
1716

@@ -274,18 +273,6 @@ class TCreateDatabaseRequestActor : public NActors::TActorBootstrapped<TCreateDa
274273
};
275274
};
276275

277-
bool IsValidLoadControlConfig(const NConfig::TLoadControlConfig& config) {
278-
if (!config.GetEnable()) {
279-
return true;
280-
}
281-
282-
const auto& databaseConnection = config.GetDatabaseConnection();
283-
if (!databaseConnection.GetDatabase()) {
284-
return false;
285-
}
286-
return databaseConnection.GetEndpoint() || config.GetMonitoringEndpoint();
287-
}
288-
289276
}
290277

291278
class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrapped<TComputeDatabaseControlPlaneServiceActor> {
@@ -320,7 +307,7 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
320307
switch (controlPlane.type_case()) {
321308
case NConfig::TYdbComputeControlPlane::TYPE_NOT_SET:
322309
case NConfig::TYdbComputeControlPlane::kSingle:
323-
CreateSingleClientActors();
310+
CreateSingleClientActors(controlPlane.GetSingle());
324311
break;
325312
case NConfig::TYdbComputeControlPlane::kCms:
326313
CreateCmsClientActors(controlPlane.GetCms(), controlPlane.GetDatabasesCacheReloadPeriod());
@@ -339,13 +326,11 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
339326
if (connection.GetCertificateFile()) {
340327
settings.CertificateRootCA = StripString(TFileInput(connection.GetCertificateFile()).ReadAll());
341328
}
342-
settings.Headers[NYdb::YDB_DATABASE_HEADER] = connection.GetDatabase();
343329
return settings;
344330
}
345331

346-
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
332+
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const auto& connection) {
347333
NGrpcActorClient::TGrpcClientSettings settings;
348-
const auto& connection = config.GetExecutionConnection();
349334
settings.Endpoint = connection.GetEndpoint();
350335
settings.EnableSsl = connection.GetUseSsl();
351336
if (connection.GetCertificateFile()) {
@@ -355,21 +340,23 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
355340
return settings;
356341
}
357342

358-
void CreateSingleClientActors() {
343+
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
344+
return CreateGrpcClientSettings(config.GetControlPlaneConnection());
345+
}
346+
347+
void CreateSingleClientActors(const NConfig::TYdbComputeControlPlane::TSingle& singleConfig) {
359348
auto globalLoadConfig = Config.GetYdb().GetLoadControlConfig();
360-
if (!globalLoadConfig.GetEnable() || !IsValidLoadControlConfig(globalLoadConfig)) {
361-
return;
362-
}
363-
TActorId clientActor;
364-
auto monitoringEndpoint = globalLoadConfig.GetMonitoringEndpoint();
365-
const auto& databaseConnection = globalLoadConfig.GetDatabaseConnection();
366-
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(databaseConnection))->CreateProvider();
367-
if (monitoringEndpoint) {
368-
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, databaseConnection.GetDatabase(), credentialsProvider).release());
369-
} else {
370-
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(databaseConnection), credentialsProvider).release());
349+
if (globalLoadConfig.GetEnable()) {
350+
TActorId clientActor;
351+
auto monitoringEndpoint = globalLoadConfig.GetMonitoringEndpoint();
352+
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(singleConfig.GetConnection()))->CreateProvider();
353+
if (monitoringEndpoint) {
354+
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, singleConfig.GetConnection().GetDatabase(), credentialsProvider).release());
355+
} else {
356+
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(singleConfig.GetConnection()), credentialsProvider).release());
357+
}
358+
MonitoringActorId = Register(CreateDatabaseMonitoringActor(clientActor, globalLoadConfig, Counters).release());
371359
}
372-
MonitoringActorId = Register(CreateDatabaseMonitoringActor(clientActor, globalLoadConfig, Counters).release());
373360
}
374361

375362
void CreateCmsClientActors(const NConfig::TYdbComputeControlPlane::TCms& cmsConfig, const TString& databasesCacheReloadPeriod) {
@@ -383,15 +370,14 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
383370
const NConfig::TLoadControlConfig& loadConfig = config.GetLoadControlConfig().GetEnable()
384371
? config.GetLoadControlConfig()
385372
: globalLoadConfig;
386-
if (loadConfig.GetEnable() && IsValidLoadControlConfig(loadConfig)) {
373+
if (loadConfig.GetEnable()) {
387374
TActorId clientActor;
388375
auto monitoringEndpoint = loadConfig.GetMonitoringEndpoint();
389-
const auto& databaseConnection = loadConfig.GetDatabaseConnection();
390-
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(databaseConnection))->CreateProvider();
376+
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(config.GetControlPlaneConnection()))->CreateProvider();
391377
if (monitoringEndpoint) {
392-
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, databaseConnection.GetDatabase(), credentialsProvider).release());
378+
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, config.GetControlPlaneConnection().GetDatabase(), credentialsProvider).release());
393379
} else {
394-
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(databaseConnection), credentialsProvider).release());
380+
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(config), credentialsProvider).release());
395381
}
396382
databaseMonitoringActor = Register(CreateDatabaseMonitoringActor(clientActor, loadConfig, databaseCounters).release());
397383
}
@@ -408,15 +394,14 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
408394
const NConfig::TLoadControlConfig& loadConfig = config.GetLoadControlConfig().GetEnable()
409395
? config.GetLoadControlConfig()
410396
: globalLoadConfig;
411-
if (loadConfig.GetEnable() && IsValidLoadControlConfig(loadConfig)) {
397+
if (loadConfig.GetEnable()) {
412398
TActorId clientActor;
413399
auto monitoringEndpoint = loadConfig.GetMonitoringEndpoint();
414-
const auto& databaseConnection = loadConfig.GetDatabaseConnection();
415-
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(databaseConnection))->CreateProvider();
400+
auto credentialsProvider = CredentialsProviderFactory(GetYdbCredentialSettings(config.GetControlPlaneConnection()))->CreateProvider();
416401
if (monitoringEndpoint) {
417-
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, databaseConnection.GetDatabase(), credentialsProvider).release());
402+
clientActor = Register(CreateMonitoringRestClientActor(monitoringEndpoint, config.GetControlPlaneConnection().GetDatabase(), credentialsProvider).release());
418403
} else {
419-
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(databaseConnection), credentialsProvider).release());
404+
clientActor = Register(CreateMonitoringGrpcClientActor(CreateGrpcClientSettings(config), credentialsProvider).release());
420405
}
421406
databaseMonitoringActor = Register(CreateDatabaseMonitoringActor(clientActor, loadConfig, databaseCounters).release());
422407
}

‎ydb/core/fq/libs/compute/ydb/control_plane/ya.make

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@ SRCS(
1212

1313
PEERDIR(
1414
library/cpp/json
15+
ydb/library/actors/core
16+
ydb/library/actors/protos
17+
ydb/library/grpc/actor_client
1518
ydb/core/fq/libs/compute/ydb/synchronization_service
1619
ydb/core/fq/libs/control_plane_storage/proto
1720
ydb/core/fq/libs/quota_manager/proto
1821
ydb/core/protos
19-
ydb/library/actors/core
20-
ydb/library/actors/protos
2122
ydb/library/db_pool/protos
22-
ydb/library/grpc/actor_client
2323
ydb/library/yql/public/issue
2424
ydb/library/yql/utils
2525
ydb/library/yql/utils/actors
2626
ydb/public/api/grpc
2727
ydb/public/api/grpc/draft
2828
ydb/public/lib/operation_id/protos
29-
ydb/public/sdk/cpp/client/resources
30-
ydb/public/sdk/cpp/client/ydb_operation
31-
ydb/public/sdk/cpp/client/ydb_query
3229
)
3330

3431
YQL_LAST_ABI_VERSION()

‎ydb/core/fq/libs/config/protos/compute.proto

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ message TLoadControlConfig {
2727
bool Strict = 7; // default false, whether to deny execution in load level unavailable
2828
uint32 CpuNumber = 8;
2929
string MonitoringEndpoint = 9; // if defined, will be used as REST API instead of default GRPC
30-
TYdbStorageConfig DatabaseConnection = 10;
3130
}
3231

3332
message TComputeDatabaseConfig {

‎ydb/library/grpc/actor_client/grpc_service_client.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class TGrpcServiceClient {
2222
using TServiceConnection = NYdbGrpc::TServiceConnection<TGrpcService>;
2323

2424
NYdbGrpc::TGRpcClientConfig Config;
25-
std::unordered_map<TString, TString> Headers;
2625
NYdbGrpc::TGRpcClientLow Client;
2726
std::unique_ptr<TServiceConnection> Connection;
2827

@@ -94,9 +93,6 @@ class TGrpcServiceClient {
9493
if (requestId) {
9594
meta.Aux.push_back({"x-request-id", requestId});
9695
}
97-
for (auto [k ,v]: Headers) {
98-
meta.Aux.push_back({k, v});
99-
}
10096

10197
NYdbGrpc::TResponseCallback<TResponseType> callback =
10298
[actorSystem = NActors::TActivationContext::ActorSystem(), prefix = Prefix(requestId), request = ev](NYdbGrpc::TGrpcStatus&& status, TResponseType&& response) -> void {
@@ -133,7 +129,6 @@ class TGrpcServiceClient {
133129

134130
TGrpcServiceClient(const NGrpcActorClient::TGrpcClientSettings& settings)
135131
: Config(InitGrpcConfig(settings))
136-
, Headers(settings.Headers)
137132
{}
138133
};
139134

‎ydb/library/grpc/actor_client/grpc_service_settings.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22
#include <util/generic/string.h>
33
#include <util/system/types.h>
4-
#include <unordered_map>
54

65
namespace NGrpcActorClient {
76

@@ -13,7 +12,6 @@ struct TGrpcClientSettings {
1312
ui32 GrpcKeepAlivePingInterval = 5000;
1413
bool EnableSsl = false;
1514
ui64 RequestTimeoutMs = 10000; // 10 seconds
16-
std::unordered_map<TString, TString> Headers;
1715
};
1816

1917
} // namespace NGrpcActorClient

0 commit comments

Comments
 (0)