Merge 83488a7 into 9dbab08

Author: StekPerepolnen

ydb/core/viewer/protos/viewer.proto

@@ -382,6 +382,7 @@ message TTenant {
     uint64 StorageAllocatedLimit = 41;
     Ydb.Cms.DatabaseQuotas DatabaseQuotas = 42;
     repeated TStorageUsage StorageUsage = 43;
+    repeated TStorageUsage BlobStorage = 44;
 }
 
 message TTenants {

ydb/core/viewer/viewer_tenantinfo.h

@@ -46,9 +46,11 @@ class TJsonTenantInfo : public TViewerPipeClient {
     THashMap<TString, std::vector<TNodeId>> TenantNodes;
     THashMap<TString, NKikimrViewer::TEvViewerResponse> OffloadMergedTabletStateResponse;
     THashMap<TString, NKikimrViewer::TEvViewerResponse> OffloadMergedSystemStateResponse;
+    THashMap<TString, NKikimrViewer::TStorageUsage::EType> StoragePoolType;
     TTabletId RootHiveId = 0;
     TString RootId; // id of root domain (tenant)
     NKikimrViewer::TTenantInfo Result;
+    std::optional<TRequestResponse<NSysView::TEvSysView::TEvGetStoragePoolsResponse>> GetStoragePoolsResponse;
 
     struct TStorageQuota {
         uint64 SoftQuota = 0;
@@ -87,6 +89,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
     }
 
     void Bootstrap() override {
+        Cerr << "iiiiiiii Bootstrap " << Endl;
         BLOG_TRACE("Bootstrap()");
         const auto& params(Event->Get()->Request.GetParams());
         JsonSettings.EnumAsNumbers = !FromStringWithDefault<bool>(params.Get("enums"), true);
@@ -124,6 +127,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
         if (Storage) {
             RequestHiveStorageStats(RootHiveId);
         }
+        GetStoragePoolsResponse = RequestBSControllerPools();
 
         if (Requests == 0) {
             ReplyAndPassAway();
@@ -154,9 +158,10 @@ class TJsonTenantInfo : public TViewerPipeClient {
             hFunc(TEvViewer::TEvViewerResponse, Handle);
             hFunc(TEvents::TEvUndelivered, Undelivered);
             hFunc(TEvInterconnect::TEvNodeDisconnected, Disconnected);
-            hFunc(TEvTabletPipe::TEvClientConnected, TBase::Handle);
+            hFunc(TEvTabletPipe::TEvClientConnected, Handle);
             hFunc(TEvStateStorage::TEvBoardInfo, Handle);
             hFunc(NHealthCheck::TEvSelfCheckResultProto, Handle);
+            hFunc(NSysView::TEvSysView::TEvGetStoragePoolsResponse, Handle);
             cFunc(TEvents::TSystem::Wakeup, HandleTimeout);
         }
     }
@@ -534,7 +539,32 @@ class TJsonTenantInfo : public TViewerPipeClient {
         return type;
     }
 
+    void Handle(TEvTabletPipe::TEvClientConnected::TPtr& ev) {
+        if (ev->Get()->Status != NKikimrProto::OK) {
+            TString error = TStringBuilder() << "Failed to establish pipe: " << NKikimrProto::EReplyStatus_Name(ev->Get()->Status);
+            if (ev->Get()->TabletId == GetBSControllerId()) {
+                if (GetStoragePoolsResponse.has_value()) {
+                    GetStoragePoolsResponse->Error(error);
+                }
+            }
+        }
+        TBase::Handle(ev); // all RequestDone() are handled by base handler
+    }
+
+    void Handle(NSysView::TEvSysView::TEvGetStoragePoolsResponse::TPtr& ev) {
+        GetStoragePoolsResponse->Set(std::move(ev));
+
+        if (GetStoragePoolsResponse && GetStoragePoolsResponse->IsOk()) {
+            for (const NKikimrSysView::TStoragePoolEntry& entry : GetStoragePoolsResponse->Get()->Record.GetEntries()) {
+                StoragePoolType[entry.GetInfo().GetName()] = GetStorageType(entry.GetInfo().GetKind());
+            }
+        }
+
+        RequestDone();
+    }
+
     void ReplyAndPassAway() override {
+        Cerr << "iiiiiiii ReplyAndPassAway " << Endl;
         BLOG_TRACE("ReplyAndPassAway() started");
         TIntrusivePtr<TDomainsInfo> domains = AppData()->DomainsInfo;
         auto *domain = domains->GetDomain();
@@ -666,6 +696,7 @@ class TJsonTenantInfo : public TViewerPipeClient {
                 }
 
                 if (Storage) {
+                    THashMap<NKikimrViewer::TStorageUsage::EType, ui64> blobStorageByType;
                     auto itHiveStorageStats = HiveStorageStats.find(hiveId);
                     if (itHiveStorageStats != HiveStorageStats.end()) {
                         const NKikimrHive::TEvResponseHiveStorageStats& record = itHiveStorageStats->second.Get()->Record;
@@ -675,9 +706,13 @@ class TJsonTenantInfo : public TViewerPipeClient {
                         uint64 storageGroups = 0;
                         for (const NKikimrHive::THiveStoragePoolStats& poolStat : record.GetPools()) {
                             if (poolStat.GetName().StartsWith(tenantBySubDomainKey.GetName())) {
+                                Cerr << "iiiiiiii PoolStat: " << poolStat.GetName() << Endl;
+                                NKikimrViewer::TStorageUsage::EType storageType = GetStorageType(poolStat.GetName());
                                 for (const NKikimrHive::THiveStorageGroupStats& groupStat : poolStat.GetGroups()) {
                                     storageAllocatedSize += groupStat.GetAllocatedSize();
                                     storageAvailableSize += groupStat.GetAvailableSize();
+                                    blobStorageByType[storageType] += groupStat.GetAllocatedSize();
+                                    blobStorageByType[storageType] += groupStat.GetAvailableSize();
                                     storageMinAvailableSize = std::min(storageMinAvailableSize, groupStat.GetAvailableSize());
                                     ++storageGroups;
                                 }
@@ -729,6 +764,12 @@ class TJsonTenantInfo : public TViewerPipeClient {
                             storageUsage.SetHardQuota(it->second.HardQuota);
                         }
                     }
+
+                    for (const auto& [type, size] : blobStorageByType) {
+                        auto& blobStorage = *tenant.AddBlobStorage();
+                        blobStorage.SetType(type);
+                        blobStorage.SetSize(size);
+                    }
                 }
 
                 THashSet<TNodeId> tenantNodes;