Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions ydb/core/grpc_services/counters/proxy_counters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class TGRpcProxyCounters : public IGRpcProxyCounters {
::NMonitoring::TDynamicCounters::TCounterPtr DatabaseAccessDenyCounter_;
::NMonitoring::TDynamicCounters::TCounterPtr DatabaseSchemeErrorCounter_;
::NMonitoring::TDynamicCounters::TCounterPtr DatabaseUnavailableCounter_;
::NMonitoring::TDynamicCounters::TCounterPtr EmptyDatabaseNameCounter_;
::NMonitoring::TDynamicCounters::TCounterPtr DatabaseRateLimitedCounter_;
::NMonitoring::TDynamicCounters::TCounterPtr ConsumedRUCounter_;
NMonitoring::THistogramPtr ThrottleDelayHistogram_;
Expand All @@ -38,6 +39,8 @@ class TGRpcProxyCounters : public IGRpcProxyCounters {
DatabaseSchemeErrorCounter_ = group->GetCounter("databaseSchemeError", true);
DatabaseUnavailableCounter_ = group->GetCounter("databaseUnavailable", true);

EmptyDatabaseNameCounter_ = group->GetCounter("emptyDatabaseName", true);

DatabaseRateLimitedCounter_ = group->GetCounter("api.grpc.request.throughput_quota_exceeded_count", true);

ConsumedRUCounter_ = group->GetCounter("api.grpc.response.consumed_request_units", true);
Expand All @@ -59,6 +62,10 @@ class TGRpcProxyCounters : public IGRpcProxyCounters {
DatabaseUnavailableCounter_->Inc();
}

void IncEmptyDatabaseNameCounter() override {
EmptyDatabaseNameCounter_->Inc();
}

void IncDatabaseRateLimitedCounter() override {
DatabaseRateLimitedCounter_->Inc();
}
Expand Down Expand Up @@ -274,6 +281,10 @@ class TGRpcProxyCountersWrapper : public IGRpcProxyCounters {
Db->IncDatabaseUnavailableCounter();
}

void IncEmptyDatabaseNameCounter() override {
Common->IncEmptyDatabaseNameCounter();
}

void IncDatabaseRateLimitedCounter() override {
Common->IncDatabaseRateLimitedCounter();
Db->IncDatabaseRateLimitedCounter();
Expand Down
1 change: 1 addition & 0 deletions ydb/core/grpc_services/counters/proxy_counters.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class IGRpcProxyCounters : public virtual TThrRefBase {
virtual void IncDatabaseAccessDenyCounter() = 0;
virtual void IncDatabaseSchemeErrorCounter() = 0;
virtual void IncDatabaseUnavailableCounter() = 0;
virtual void IncEmptyDatabaseNameCounter() = 0;
virtual void IncDatabaseRateLimitedCounter() = 0;

virtual void AddConsumedRequestUnits(ui64 requestUnits) = 0;
Expand Down
19 changes: 11 additions & 8 deletions ydb/core/grpc_services/grpc_request_proxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,18 @@ class TGRpcRequestProxyImpl
if (maybeDatabaseName && !maybeDatabaseName.GetRef().empty()) {
databaseName = CanonizePath(maybeDatabaseName.GetRef());
} else {
if (!AllowYdbRequestsWithoutDatabase && DynamicNode && !std::is_same_v<TEvent, TEvRequestAuthAndCheck>) { // TEvRequestAuthAndCheck is allowed to be processed without database
requestBaseCtx->ReplyUnauthenticated("Requests without specified database are not allowed");
requestBaseCtx->FinishSpan();
return;
} else {
databaseName = RootDatabase;
skipResourceCheck = true;
skipCheckConnectRights = true;
if (!std::is_same_v<TEvent, TEvRequestAuthAndCheck>) { // TEvRequestAuthAndCheck is allowed to be processed without database
Counters->IncEmptyDatabaseNameCounter();
if (DynamicNode && !AllowYdbRequestsWithoutDatabase) {
requestBaseCtx->ReplyUnauthenticated("Requests without specified database are not allowed");
requestBaseCtx->FinishSpan();
return;
}
}

databaseName = RootDatabase;
skipResourceCheck = true;
skipCheckConnectRights = true;
}
if (databaseName.empty()) {
Counters->IncDatabaseUnavailableCounter();
Expand Down
Loading