Merge ef06df1 into dfb50ad

Author: StekPerepolnen

ydb/core/viewer/json_pipe_req.h

@@ -142,6 +142,14 @@ class TViewerPipeClient : public TActorBootstrapped<TDerived> {
         SendRequestToPipe(pipeClient, request.Release());
     }
 
+    void RequestBSControllerConfigWithStoragePools() {
+        TActorId pipeClient = ConnectTabletPipe(GetBSControllerId());
+        THolder<TEvBlobStorage::TEvControllerConfigRequest> request = MakeHolder<TEvBlobStorage::TEvControllerConfigRequest>();
+        request->Record.MutableRequest()->AddCommand()->MutableQueryBaseConfig();
+        request->Record.MutableRequest()->AddCommand()->MutableReadStoragePool()->SetBoxId(Max<ui64>());
+        SendRequestToPipe(pipeClient, request.Release());
+    }
+
     void RequestBSControllerInfo() {
         TActorId pipeClient = ConnectTabletPipe(GetBSControllerId());
         THolder<TEvBlobStorage::TEvRequestControllerInfo> request = MakeHolder<TEvBlobStorage::TEvRequestControllerInfo>();

ydb/core/viewer/json_storage.h

@@ -20,6 +20,7 @@ class TJsonStorage : public TJsonStorageBase {
     enum class EGroupSort {
         PoolName,
         Kind,
+        MediaType,
         Erasure,
         Degraded,
         Usage,
@@ -46,6 +47,7 @@ class TJsonStorage : public TJsonStorageBase {
         TString PoolName;
         TString GroupId;
         TString Kind;
+        TString MediaType;
         TString Erasure;
         ui32 Degraded;
         float Usage;
@@ -100,6 +102,8 @@ class TJsonStorage : public TJsonStorageBase {
                 GroupSort = EGroupSort::PoolName;
             } else if (sort == "Kind") {
                 GroupSort = EGroupSort::Kind;
+            } else if (sort == "MediaType") {
+                GroupSort = EGroupSort::MediaType;
             } else if (sort == "Erasure") {
                 GroupSort = EGroupSort::Erasure;
             } else if (sort == "Degraded") {
@@ -142,6 +146,7 @@ class TJsonStorage : public TJsonStorageBase {
             const auto& groupRow = GroupRowsByGroupId[groupId];
             json << "\"PoolName\":\"" << groupRow.PoolName << "\",";
             json << "\"Kind\":\"" << groupRow.Kind << "\",";
+            json << "\"MediaType\":\"" << groupRow.MediaType << "\",";
             json << "\"Erasure\":\"" << groupRow.Erasure << "\",";
             json << "\"Degraded\":\"" << groupRow.Degraded << "\",";
             json << "\"Usage\":\"" << groupRow.Usage << "\",";
@@ -310,6 +315,7 @@ class TJsonStorage : public TJsonStorageBase {
                 row.PoolName = poolName;
                 row.GroupId = groupId;
                 row.Kind = poolInfo.Kind;
+                row.MediaType = poolInfo.MediaType;
                 auto ib = BSGroupIndex.find(groupId);
                 if (ib != BSGroupIndex.end()) {
                     row.Erasure = ib->second.GetErasureSpecies();
@@ -391,6 +397,9 @@ class TJsonStorage : public TJsonStorageBase {
                 case EGroupSort::Kind:
                     SortCollection(GroupRows, [](const TGroupRow& node) { return node.Kind;}, ReverseSort);
                     break;
+                case EGroupSort::MediaType:
+                    SortCollection(GroupRows, [](const TGroupRow& node) { return node.MediaType;}, ReverseSort);
+                    break;
                 case EGroupSort::Erasure:
                     SortCollection(GroupRows, [](const TGroupRow& node) { return node.Erasure;}, ReverseSort);
                     break;
@@ -494,7 +503,7 @@ struct TJsonRequestParameters<TJsonStorage> {
                       {"name":"version","in":"query","description":"query version (v1, v2)","required":false,"type":"string"},
                       {"name":"usage_pace","in":"query","description":"bucket size as a percentage","required":false,"type":"integer","default":5},
                       {"name":"usage_buckets","in":"query","description":"filter groups by usage buckets","required":false,"type":"integer"},
-                      {"name":"sort","in":"query","description":"sort by (PoolName,Type,Erasure,Degraded,Usage,GroupId,Used,Limit,Read,Write)","required":false,"type":"string"},
+                      {"name":"sort","in":"query","description":"sort by (PoolName,Kind,MediaType,Erasure,Degraded,Usage,GroupId,Used,Limit,Read,Write)","required":false,"type":"string"},
                       {"name":"offset","in":"query","description":"skip N nodes","required":false,"type":"integer"},
                       {"name":"limit","in":"query","description":"limit to N nodes","required":false,"type":"integer"},
                       {"name":"timeout","in":"query","description":"timeout in ms","required":false,"type":"integer"}])___";

ydb/core/viewer/json_storage_base.h

@@ -62,6 +62,7 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
 
     struct TStoragePoolInfo {
         TString Kind;
+        TString MediaType;
         TSet<TString> Groups;
         NKikimrViewer::EFlag Overall = NKikimrViewer::EFlag::Grey;
     };
@@ -98,6 +99,7 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
         TString PoolName;
         TString GroupId;
         TString Kind;
+        TString MediaType;
         TString Erasure;
         ui32 Degraded;
         float Usage;
@@ -172,7 +174,7 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
             return;
         }
 
-        RequestBSControllerConfig();
+        RequestBSControllerConfigWithStoragePools();
 
         TBase::Become(&TThis::StateWork);
         Schedule(TDuration::MilliSeconds(Timeout / 100 * 70), new TEvents::TEvWakeup(TimeoutBSC)); // 70% timeout (for bsc)
@@ -205,6 +207,17 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
         RequestDone();
     }
 
+    TString GetMediaType(const NKikimrBlobStorage::TDefineStoragePool& pool) const {
+        for (const NKikimrBlobStorage::TPDiskFilter& filter : pool.GetPDiskFilter()) {
+            for (const NKikimrBlobStorage::TPDiskFilter::TRequiredProperty& property : filter.GetProperty()) {
+                if (property.HasType()) {
+                    return ToString(property.GetType());
+                }
+            }
+        }
+        return TString();
+    }
+
     void Handle(TEvBlobStorage::TEvControllerConfigResponse::TPtr& ev) {
         const NKikimrBlobStorage::TEvControllerConfigResponse& pbRecord(ev->Get()->Record);
 
@@ -231,6 +244,9 @@ class TJsonStorageBase : public TViewerPipeClient<TJsonStorageBase> {
                         SendNodeRequests(nodeId);
                     }
                 }
+                for (const NKikimrBlobStorage::TDefineStoragePool& pool : pbStatus.GetStoragePool()) {
+                    StoragePoolInfo[pool.GetName()].MediaType = GetMediaType(pool);
+                }
             }
         }
         RequestDone();