Fix possible write session frozing (ydb-platform#8075)

siarheivesialou · Aug 22, 2024 · b209651 · b209651
1 parent 44f362f
commit b209651
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_session.h b/ydb/services/deprecated/persqueue_v0/grpc_pq_session.h
@@ -306,10 +306,10 @@ class ISession : public ISessionHandler<TResponse>
 protected:
     grpc::ServerCompletionQueue* const CQ;
     grpc::ServerContext Context;
-    grpc::ServerAsyncReaderWriter<TResponse, TRequest>
-            Stream;
-private:
+    grpc::ServerAsyncReaderWriter<TResponse, TRequest> Stream;
+
     TSpinLock Lock;
+private:
     bool HaveWriteInflight;
     bool NeedFinish;
     std::atomic<bool> ClientIsDone;

diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_write.cpp
@@ -25,20 +25,23 @@ void TPQWriteServiceImpl::TSession::OnCreated() {            // Start waiting fo
         ReplyWithError("proxy overloaded", NPersQueue::NErrorCode::OVERLOAD);
         return;
     }
-    TMaybe<TString> localCluster = Proxy->AvailableLocalCluster();
     if (NeedDiscoverClusters) {
+        TMaybe<TString> localCluster = Proxy->AvailableLocalCluster();
         if (!localCluster.Defined()) {
             ReplyWithError("initializing", NPersQueue::NErrorCode::INITIALIZING);
             return;
         } else if (localCluster->empty()) {
             ReplyWithError("cluster disabled", NPersQueue::NErrorCode::CLUSTER_DISABLED);
             return;
-        } else {
-            CreateActor(*localCluster);
+        } else if (!CreateActor(*localCluster)) {
+            Proxy->ReleaseSession(this);
+            return;
         }
-    } else {
-        CreateActor(TString());
+    } else if (!CreateActor(TString())) {
+        Proxy->ReleaseSession(this);
+        return;
     }
+
     ReadyForNextRead();
 }
 
@@ -61,9 +64,14 @@ void TPQWriteServiceImpl::TSession::OnRead(const TWriteRequest& request) {
 }
 
 void TPQWriteServiceImpl::TSession::OnDone() {
+    {
+        TGuard<TSpinLock> lock(Lock);
+        IsDone = true;
+    }
     SendEvent(new TEvPQProxy::TEvDone());
 }
 
+
 TPQWriteServiceImpl::TSession::TSession(std::shared_ptr<TPQWriteServiceImpl> proxy,
              grpc::ServerCompletionQueue* cq, ui64 cookie, const TActorId& schemeCache,
              TIntrusivePtr<NMonitoring::TDynamicCounters> counters, bool needDiscoverClusters)
@@ -97,18 +105,30 @@ bool TPQWriteServiceImpl::TSession::IsShuttingDown() const {
     return Proxy->IsShuttingDown();
 }
 
-void TPQWriteServiceImpl::TSession::CreateActor(const TString &localCluster) {
+bool TPQWriteServiceImpl::TSession::CreateActor(const TString &localCluster) {
+    TGuard<TSpinLock> lock(Lock);
+    if (IsDone) {
+        ReplyWithError("is done", NPersQueue::NErrorCode::INITIALIZING);
+        return false;
+    }
 
     auto classifier = Proxy->GetClassifier();
     ActorId = Proxy->ActorSystem->Register(
         new TWriteSessionActor(this, Cookie, SchemeCache, Counters, localCluster,
                                         classifier ? classifier->ClassifyAddress(GetPeerName())
                                                    : "unknown"), TMailboxType::Simple, 0
     );
+    return true;
 }
 
 void TPQWriteServiceImpl::TSession::SendEvent(IEventBase* ev) {
-    Proxy->ActorSystem->Send(ActorId, ev);
+    std::unique_ptr<IEventBase>  e;
+    e.reset(ev);
+
+    TGuard<TSpinLock> lock(Lock);
+    if (ActorId) {
+        Proxy->ActorSystem->Send(ActorId, e.release());
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////

diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h b/ydb/services/deprecated/persqueue_v0/grpc_pq_write.h
@@ -38,7 +38,7 @@ class TPQWriteServiceImpl : public IPQClustersUpdaterCallback, public std::enabl
         bool IsShuttingDown() const override;
 
     private:
-        void CreateActor(const TString& localCluster);
+        [[nodiscard]] bool CreateActor(const TString& localCluster);
         void SendEvent(NActors::IEventBase* ev);
 
     private:
@@ -52,6 +52,7 @@ class TPQWriteServiceImpl : public IPQClustersUpdaterCallback, public std::enabl
         TIntrusivePtr<NMonitoring::TDynamicCounters> Counters;
 
         bool NeedDiscoverClusters;
+        bool IsDone = false;
     };
     using TSessionRef = TIntrusivePtr<TSession>;
 

diff --git a/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp b/ydb/services/deprecated/persqueue_v0/grpc_pq_write_actor.cpp
@@ -160,6 +160,7 @@ void TWriteSessionActor::CheckFinish(const TActorContext& ctx) {
 }
 
 void TWriteSessionActor::Handle(TEvPQProxy::TEvDone::TPtr&, const TActorContext& ctx) {
+    LOG_INFO_S(ctx, NKikimrServices::PQ_WRITE_PROXY, "session cookie: " << Cookie << " sessionId: " << OwnerCookie << " got TEvDone");
     WritesDone = true;
     CheckFinish(ctx);
 }
@@ -339,7 +340,7 @@ void TWriteSessionActor::Handle(TEvDescribeTopicsResponse::TPtr& ev, const TActo
             errorReason = Sprintf("topic '%s' describe error, Status# %s, Marker# PQ1", path.back().c_str(),
                                   ToString(entry.Status).c_str());
             CloseSession(errorReason, NPersQueue::NErrorCode::ERROR, ctx);
-            break;
+            return;
         }
     }
     if (!entry.PQGroupInfo) {