Fix test TTopicApiDescribes.DescribeTopic (ydb-platform#3288)

maximyurchuk · Apr 1, 2024 · e0f019d · e0f019d
1 parent 05cd065
commit e0f019d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt
@@ -52,7 +52,6 @@ ydb/services/fq/ut_integration Yq_1.*
 ydb/services/keyvalue/ut KeyValueGRPCService.SimpleWriteRead
 ydb/services/keyvalue/ut KeyValueGRPCService.SimpleCopyUnexistedKey
 ydb/services/keyvalue/ut sole*
-ydb/services/persqueue_v1/ut/describes_ut TTopicApiDescribes.DescribeTopic
 ydb/services/persqueue_v1/ut TPersQueueTest.CheckACLForGrpcWrite
 ydb/services/persqueue_v1/ut TPersQueueTest.SetupLockSession
 ydb/services/persqueue_v1/ut TPersQueueTest.TopicServiceCommitOffsetBadOffsets

diff --git a/ydb/core/persqueue/pq_impl.cpp b/ydb/core/persqueue/pq_impl.cpp
@@ -1424,6 +1424,10 @@ void TPersQueue::Handle(TEvPQ::TEvInitComplete::TPtr& ev, const TActorContext& c
     if (!partitionId.IsSupportivePartition()) {
         ProcessCheckPartitionStatusRequests(partitionId);
     }
+
+    if (allInitialized) {
+        ProcessStatusRequests(ctx);
+    }
 }
 
 void TPersQueue::Handle(TEvPQ::TEvError::TPtr& ev, const TActorContext& ctx)
@@ -1789,18 +1793,20 @@ void TPersQueue::Handle(TEvPersQueue::TEvPartitionClientInfo::TPtr& ev, const TA
     }
 }
 
+void TPersQueue::ProcessStatusRequests(const TActorContext &ctx) {
+    for (auto& ev : StatusRequests) {
+        Handle(ev, ctx);
+    }
+    StatusRequests.clear();
+}
 
 void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext& ctx)
 {
     ReadBalancerActorId = ev->Sender;
 
-    if (!ConfigInited) {
-        THolder<TEvPersQueue::TEvStatusResponse> res = MakeHolder<TEvPersQueue::TEvStatusResponse>();
-        auto& resp = res->Record;
-        resp.SetTabletId(TabletID());
-
-        ctx.Send(ev->Sender, res.Release());
-        return;
+    if (!ConfigInited || !AllOriginalPartitionsInited()) {
+      StatusRequests.push_back(ev);
+      return;
     }
 
     ui32 cnt = 0;
@@ -1810,8 +1816,9 @@ void TPersQueue::Handle(TEvPersQueue::TEvStatus::TPtr& ev, const TActorContext&
 
     TActorId ans = CreateStatusProxyActor(TabletID(), ev->Sender, cnt, ev->Cookie, ctx);
     for (auto& p : Partitions) {
-        if (!p.second.InitDone)
+        if (!p.second.InitDone) {
             continue;
+        }
         THolder<TEvPQ::TEvPartitionStatus> event;
         if (ev->Get()->Record.GetConsumers().empty()) {
             event = MakeHolder<TEvPQ::TEvPartitionStatus>(ans, ev->Get()->Record.HasClientId() ? ev->Get()->Record.GetClientId() : "",

diff --git a/ydb/core/persqueue/pq_impl.h b/ydb/core/persqueue/pq_impl.h
@@ -429,6 +429,9 @@ class TPersQueue : public NKeyValue::TKeyValueFlat {
     void DestroySession(TPipeInfo& pipeInfo);
     bool UseMediatorTimeCast = true;
 
+    TVector<TEvPersQueue::TEvStatus::TPtr> StatusRequests;
+    void ProcessStatusRequests(const TActorContext &ctx);
+
     THashMap<ui32, TVector<TEvPQ::TEvCheckPartitionStatusRequest::TPtr>> CheckPartitionStatusRequests;
     TMaybe<ui64> TabletGeneration;