fixes after review (ydb-platform#14357)

Hor911 · Feb 10, 2025 · 7fb4b65 · 7fb4b65
1 parent 30a91ff
commit 7fb4b65
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/ydb/core/tablet/node_whiteboard.cpp b/ydb/core/tablet/node_whiteboard.cpp
@@ -849,17 +849,21 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
         std::unique_ptr<TEvWhiteboard::TEvTabletStateResponse> response = std::make_unique<TEvWhiteboard::TEvTabletStateResponse>();
         auto& record = response->Record;
         if (request.format() == "packed5") {
-            TEvWhiteboard::TEvTabletStateResponsePacked5* ptr = response->AllocatePackedResponse(TabletStateInfo.size());
+            std::vector<const NKikimrWhiteboard::TTabletStateInfo*> matchedTablets;
             for (const auto& [tabletId, tabletInfo] : TabletStateInfo) {
                 if (matchesFilter(tabletInfo)) {
-                    ptr->TabletId = tabletInfo.tabletid();
-                    ptr->FollowerId = tabletInfo.followerid();
-                    ptr->Generation = tabletInfo.generation();
-                    ptr->Type = tabletInfo.type();
-                    ptr->State = tabletInfo.state();
-                    ++ptr;
+                    matchedTablets.push_back(&tabletInfo);
                 }
             }
+            TEvWhiteboard::TEvTabletStateResponsePacked5* ptr = response->AllocatePackedResponse(matchedTablets.size());
+            for (auto tabletInfo : matchedTablets) {
+                ptr->TabletId = tabletInfo->tabletid();
+                ptr->FollowerId = tabletInfo->followerid();
+                ptr->Generation = tabletInfo->generation();
+                ptr->Type = tabletInfo->type();
+                ptr->State = tabletInfo->state();
+                ++ptr;
+            }
         } else {
             if (request.groupby().empty()) {
                 if (request.filtertabletid_size() == 0) {

diff --git a/ydb/core/viewer/viewer_tenantinfo.h b/ydb/core/viewer/viewer_tenantinfo.h
@@ -126,13 +126,12 @@ class TJsonTenantInfo : public TViewerPipeClient {
 
         if (Database.empty()) {
             ListTenantsResponse = MakeRequestConsoleListTenants();
+            NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
         } else {
             if (Database != DomainPath) {
-                NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
                 TenantStatusResponses[Database] = MakeRequestConsoleGetTenantStatus(Database);
-            } else if (DatabaseNavigateResponse && DatabaseNavigateResponse->IsOk()) {
-                NavigateKeySetResult[Database] = std::move(DatabaseNavigateResponse.value());
             }
+            NavigateKeySetResult[Database] = MakeRequestSchemeCacheNavigate(Database);
         }
 
         if (Database.empty() || Database == DomainPath) {
@@ -142,9 +141,6 @@ class TJsonTenantInfo : public TViewerPipeClient {
             tenant.SetType(NKikimrViewer::Domain);
             tenant.SetName(DomainPath);
             RequestMetadataCacheHealthCheck(DomainPath);
-            if (Database.empty() || !DatabaseNavigateResponse || !DatabaseNavigateResponse->IsOk()) {
-                NavigateKeySetResult[DomainPath] = MakeRequestSchemeCacheNavigate(DomainPath);
-            }
         }
 
         HiveDomainStats[RootHiveId] = MakeRequestHiveDomainStats(RootHiveId);