cpu usage optimization bugfix

2 files changed, 7 insertions, 4 deletions

diff --git a/ydb/core/client/server/msgbus_server_persqueue.cpp b/ydb/core/client/server/msgbus_server_persqueue.cpp
index 1f01c164463..b9680033258 100644
--- a/ydb/core/client/server/msgbus_server_persqueue.cpp
+++ b/ydb/core/client/server/msgbus_server_persqueue.cpp
@@ -321,12 +321,14 @@ bool TPersQueueBaseRequestProcessor::CreateChildren(const TActorContext& ctx) {
     Y_VERIFY(TopicsDescription->ResultSet.size() == TopicsConverters.size());
     ui32 i = 0;
     for (const auto& entry : TopicsDescription->ResultSet) {
+        auto converter = TopicsConverters[i++];
+        if (!converter) {
+            continue;
+        }
         if (entry.Kind == TSchemeCacheNavigate::EKind::KindTopic && entry.PQGroupInfo) {
-            auto converter = TopicsConverters[i++];
-            if (!converter) {
-                continue;
-            }
+
             auto name = converter->GetClientsideName();
+
             if (name.empty() || !TopicsToRequest.empty() && !IsIn(TopicsToRequest, name)) {
                 continue;
             }
diff --git a/ydb/core/client/server/msgbus_server_pq_metacache.cpp b/ydb/core/client/server/msgbus_server_pq_metacache.cpp
index 42b7829087c..787b58068c9 100644
--- a/ydb/core/client/server/msgbus_server_pq_metacache.cpp
+++ b/ydb/core/client/server/msgbus_server_pq_metacache.cpp
@@ -485,6 +485,7 @@ private:
                 if (!entry.PQGroupInfo) {
                     CurrentTopicsFullConverters.push_back(nullptr);
                 } else {
+
                     auto converter = factory.MakeTopicConverter(
                                                     entry.PQGroupInfo->Description.GetPQTabletConfig()
                                                 );