Fixed unit tests 6

Author: GrigoriyPA

ydb/core/kqp/proxy_service/kqp_proxy_databases_cache.cpp

@@ -194,13 +194,6 @@ TDatabasesCache::TDatabasesCache(TDuration idleTimeout)
     : IdleTimeout(idleTimeout)
 {}
 
-const TString& TDatabasesCache::GetTenantName() {
-    if (!TenantName) {
-        TenantName = CanonizePath(AppData()->TenantName);
-    }
-    return TenantName;
-}
-
 void TDatabasesCache::UpdateDatabaseInfo(TEvKqp::TEvUpdateDatabaseInfo::TPtr& event, TActorContext actorContext) {
     auto it = DatabasesCache.find(event->Get()->Database);
     if (it == DatabasesCache.end()) {

ydb/core/kqp/proxy_service/kqp_proxy_service_impl.h

@@ -659,13 +659,10 @@ class TDatabasesCache {
 
     template <typename TEvent>
     bool SetDatabaseIdOrDefer(TEvent& event, i32 requestType, TActorContext actorContext) {
-        if (!event->Get()->GetDatabaseId().empty()) {
-            return true;
-        }
-
         const auto& database = CanonizePath(event->Get()->GetDatabase());
-        if (database.empty() || database == GetTenantName()) {
-            event->Get()->SetDatabaseId(GetTenantName());
+        const auto& tenantName = CanonizePath(AppData()->TenantName);
+        if (database.empty() || database == tenantName) {
+            event->Get()->SetDatabaseId(tenantName);
             return true;
         }
 
@@ -689,7 +686,6 @@ class TDatabasesCache {
     void StopSubscriberActor(TActorContext actorContext) const;
 
 private:
-    const TString& GetTenantName();
     void SubscribeOnDatabase(const TString& database, TActorContext actorContext);
     void PingDatabaseSubscription(const TString& database, TActorContext actorContext) const;
 

ydb/core/kqp/session_actor/kqp_session_actor.cpp

@@ -417,6 +417,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
             << " text: " << QueryState->GetQuery()
             << " rpcActor: " << QueryState->RequestActorId
             << " database: " << QueryState->GetDatabase()
+            << " databaseId: " << QueryState->UserRequestContext->DatabaseId
             << " pool id: " << QueryState->UserRequestContext->PoolId
         );
 

ydb/core/kqp/workload_service/kqp_workload_service.cpp

@@ -232,6 +232,11 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
 
 private:
     void Handle(TEvFetchDatabaseResponse::TPtr& ev) {
+        if (ev->Get()->Status == Ydb::StatusIds::SUCCESS) {
+            LOG_D("Successfully fetched database info, DatabaseId: " << ev->Get()->DatabaseId << ", Serverless: " << ev->Get()->Serverless);
+        } else {
+            LOG_D("Failed to fetch database info, DatabaseId: " << ev->Get()->DatabaseId << ", Status: " << ev->Get()->Status << ", Issues: " << ev->Get()->Issues.ToOneLineString());
+        }
         GetOrCreateDatabaseState(ev->Get()->DatabaseId)->UpdateDatabaseInfo(ev);
     }
 
@@ -549,6 +554,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
         if (databaseIt != DatabaseToState.end()) {
             return &databaseIt->second;
         }
+        LOG_I("Creating new database state for id " << databaseId);
         return &DatabaseToState.insert({databaseId, TDatabaseState{.ActorContext = ActorContext(), .EnabledResourcePoolsOnServerless = EnabledResourcePoolsOnServerless}}).first->second;
     }
 

ydb/core/kqp/workload_service/kqp_workload_service_impl.h

@@ -2,6 +2,7 @@
 
 #include <queue>
 
+#include <ydb/core/kqp/common/events/events.h>
 #include <ydb/core/kqp/common/simple/services.h>
 #include <ydb/core/kqp/workload_service/actors/actors.h>
 #include <ydb/core/kqp/workload_service/common/cpu_quota_manager.h>
@@ -77,6 +78,10 @@ struct TDatabaseState {
             return;
         }
 
+        if (Serverless != ev->Get()->Serverless) {
+            ActorContext.Send(MakeKqpProxyID(ActorContext.SelfID.NodeId()), new TEvKqp::TEvUpdateDatabaseInfo(ev->Get()->Database, ev->Get()->DatabaseId, ev->Get()->Serverless));
+        }
+
         LastUpdateTime = TInstant::Now();
         Serverless = ev->Get()->Serverless;
         StartPendingRequests();