Skip to content

increase grpc call timeout in TMonitoringGrpcServiceActor (#10734) #10765

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

Merged
merged 1 commit into from
Oct 23, 2024
Merged

increase grpc call timeout in TMonitoringGrpcServiceActor (#10734) #10765

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
8 changes: 6 additions & 2 deletions ydb/core/fq/libs/compute/ydb/control_plane/compute_database_control_plane_service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,17 +329,21 @@ class TComputeDatabaseControlPlaneServiceActor : public NActors::TActorBootstrap
return settings;
}

static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const auto& connection) {
NGrpcActorClient::TGrpcClientSettings settings;
const auto& connection = config.GetControlPlaneConnection();
settings.Endpoint = connection.GetEndpoint();
settings.EnableSsl = connection.GetUseSsl();
if (connection.GetCertificateFile()) {
settings.CertificateRootCA = StripString(TFileInput(connection.GetCertificateFile()).ReadAll());
}
settings.RequestTimeoutMs = 20 * 1000; // todo: read from config
return settings;
}

static NGrpcActorClient::TGrpcClientSettings CreateGrpcClientSettings(const NConfig::TComputeDatabaseConfig& config) {
return CreateGrpcClientSettings(config.GetControlPlaneConnection());
}

void CreateSingleClientActors(const NConfig::TYdbComputeControlPlane::TSingle& singleConfig) {
auto globalLoadConfig = Config.GetYdb().GetLoadControlConfig();
if (globalLoadConfig.GetEnable()) {
Expand Down
5 changes: 2 additions & 3 deletions ydb/library/grpc/actor_client/grpc_service_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ class TGrpcServiceClient {
return mask;
}

static constexpr TDuration DEFAULT_TIMEOUT = TDuration::Seconds(10);

struct TGrpcRequest {
static const google::protobuf::Message& Obfuscate(const google::protobuf::Message& p) {
return p;
Expand Down Expand Up @@ -117,7 +115,8 @@ class TGrpcServiceClient {
}

static NYdbGrpc::TGRpcClientConfig InitGrpcConfig(const NGrpcActorClient::TGrpcClientSettings& settings) {
NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, DEFAULT_TIMEOUT, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
const TDuration requestTimeout = TDuration::MilliSeconds(settings.RequestTimeoutMs);
NYdbGrpc::TGRpcClientConfig config(settings.Endpoint, requestTimeout, NYdbGrpc::DEFAULT_GRPC_MESSAGE_SIZE_LIMIT, 0, settings.CertificateRootCA);
config.EnableSsl = settings.EnableSsl;
config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIME_MS] = settings.GrpcKeepAliveTimeMs;
config.IntChannelParams[GRPC_ARG_KEEPALIVE_TIMEOUT_MS] = settings.GrpcKeepAliveTimeoutMs;
Expand Down
1 change: 1 addition & 0 deletions ydb/library/grpc/actor_client/grpc_service_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ struct TGrpcClientSettings {
ui32 GrpcKeepAliveTimeoutMs = 1000;
ui32 GrpcKeepAlivePingInterval = 5000;
bool EnableSsl = false;
ui64 RequestTimeoutMs = 10000; // 10 seconds
};

} // namespace NGrpcActorClient
Loading