guid generation has been added for each GetTask

1 files changed, 8 insertions, 7 deletions

diff --git a/ydb/core/yq/libs/actors/pending_fetcher.cpp b/ydb/core/yq/libs/actors/pending_fetcher.cpp
index 9c56adf902..8477efb083 100644
--- a/ydb/core/yq/libs/actors/pending_fetcher.cpp
+++ b/ydb/core/yq/libs/actors/pending_fetcher.cpp
@@ -143,7 +143,6 @@ public:
         , CredentialsFactory(credentialsFactory)
         , S3Gateway(s3Gateway)
         , PqCmConnections(std::move(pqCmConnections))
-        , Guid(CreateGuidAsString())
         , ClientCounters(clientCounters)
         , TenantName(tenantName)
         , InternalServiceId(MakeInternalServiceActorId())
@@ -164,8 +163,9 @@ public:
         DatabaseResolver = Register(CreateDatabaseResolver(MakeYqlAnalyticsHttpProxyId(), CredentialsFactory));
         Send(SelfId(), new NActors::TEvents::TEvWakeup());
 
-        LOG_I("STARTED");
-        LogScope.ConstructInPlace(NActors::TActivationContext::ActorSystem(), NKikimrServices::YQL_PROXY, Guid);
+        TString guidActor = CreateGuidAsString();
+        LOG_I("STARTED " + guidActor);
+        LogScope.ConstructInPlace(NActors::TActivationContext::ActorSystem(), NKikimrServices::YQL_PROXY, guidActor);
     }
 
 private:
@@ -239,9 +239,10 @@ private:
     }
 
     void GetPendingTask() {
-        LOG_D("Request Private::GetTask" << ", Owner: " << Guid << ", Host: " << HostName() << ", Tenant: " << TenantName);
+        OwnerId = CreateGuidAsString();
+        LOG_D("Request Private::GetTask" << ", Owner: " << OwnerId << ", Host: " << HostName() << ", Tenant: " << TenantName);
         Yq::Private::GetTaskRequest request;
-        request.set_owner_id(Guid);
+        request.set_owner_id(OwnerId);
         request.set_host(HostName());
         request.set_tenant(TenantName);
         Send(InternalServiceId, new TEvInternalService::TEvGetTaskRequest(request));
@@ -305,7 +306,7 @@ private:
             PrivateApiConfig, GatewaysConfig, PingerConfig,
             task.text(), task.scope(), task.user_token(),
             DatabaseResolver, queryId,
-            task.user_id(), Guid, task.generation(),
+            task.user_id(), OwnerId, task.generation(),
             VectorFromProto(task.connection()),
             VectorFromProto(task.binding()),
             CredentialsFactory,
@@ -371,7 +372,7 @@ private:
     const IHTTPGateway::TPtr S3Gateway;
     const ::NPq::NConfigurationManager::IConnections::TPtr PqCmConnections;
 
-    const TString Guid; //OwnerId
+    TString OwnerId;
     const ::NMonitoring::TDynamicCounterPtr ClientCounters;
 
     TMaybe<NYql::NLog::TScopedBackend<NYql::NDq::TYqlLogScope>> LogScope;