Merge df1dd5c into 34c57d8

ydb-platform · Apr 26, 2024 · f2fb2eb · f2fb2eb
2 parents 34c57d8 + df1dd5c
commit f2fb2eb
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/ydb/core/viewer/json_tenantinfo.h b/ydb/core/viewer/json_tenantinfo.h
@@ -436,16 +436,17 @@ class TJsonTenantInfo : public TViewerPipeClient<TJsonTenantInfo> {
     }
 
     void Disconnected(TEvInterconnect::TEvNodeDisconnected::TPtr &ev) {
-        ui32 nodeId = ev->Get()->NodeId;
+        TNodeId nodeId = ev->Get()->NodeId;
+        TString& tenantId = NodeIdsToTenant[nodeId];
         BLOG_TRACE("NodeDisconnected for node " << nodeId);
-        if (NodeSysInfo.emplace(nodeId, NKikimrWhiteboard::TEvSystemStateResponse{}).second) {
-            RequestDone();
-        }
-        auto tenantId = NodeIdsToTenant[nodeId];
-        if (TenantNodeTabletInfo[tenantId].emplace(nodeId, NKikimrWhiteboard::TEvTabletStateResponse{}).second) {
-            RequestDone();
-        }
-        if (!TenantNodes[tenantId].empty()) {
+        if (!OffloadMerge) {
+            if (NodeSysInfo.emplace(nodeId, NKikimrWhiteboard::TEvSystemStateResponse{}).second) {
+                RequestDone();
+            }
+            if (Tablets && TenantNodeTabletInfo[tenantId].emplace(nodeId, NKikimrWhiteboard::TEvTabletStateResponse{}).second) {
+                RequestDone();
+            }
+        } else if (!TenantNodes[tenantId].empty()) {
             if (Tablets) {
                 SendViewerTabletRequest(tenantId);
                 RequestDone();