Move stats to TDomainInfo KIKIMR-19289

pixcc · pixcc · commit 9a77c623b87c · 2023-12-29T04:34:08.000Z
diff --git a/ydb/core/mind/hive/domain_info.h b/ydb/core/mind/hive/domain_info.h
@@ -15,6 +15,10 @@ struct TDomainInfo {
     TTabletId HiveId = 0;
     TMaybeServerlessComputeResourcesMode ServerlessComputeResourcesMode;
 
+    ui64 TabletsTotal = 0;
+    ui64 TabletsAlive = 0;
+    ui64 TabletsAliveInObjectDomain = 0;
+
     ENodeSelectionPolicy GetNodeSelectionPolicy() const;
 };
 
diff --git a/ydb/core/mind/hive/hive_impl.cpp b/ydb/core/mind/hive/hive_impl.cpp
@@ -1552,7 +1552,7 @@ void THive::DeleteTablet(TTabletId tabletId) {
         }
         const i64 tabletsTotalDiff = -1 - (tablet.Followers.size());
         UpdateCounterTabletsTotal(tabletsTotalDiff);
-        UpdateTabletsTotalByDomain(tabletsTotalDiff, tablet.ObjectDomain);
+        UpdateDomainTabletsTotal(tablet.ObjectDomain, tabletsTotalDiff);
         Tablets.erase(it);
     }
 }
@@ -1585,17 +1585,17 @@ void THive::KillNode(TNodeId nodeId, const TActorId& local) {
     Execute(CreateKillNode(nodeId, local));
 }
 
-void THive::UpdateTabletsTotalByDomain(i64 tabletsTotalDiff, const TSubDomainKey& objectDomain) {
+void THive::UpdateDomainTabletsTotal(const TSubDomainKey& objectDomain, i64 tabletsTotalDiff) {
     if (objectDomain) {
-        TabletsTotalByDomain[objectDomain] += tabletsTotalDiff;
+        Domains[objectDomain].TabletsTotal += tabletsTotalDiff;
     }
 }
 
-void THive::UpdateTabletsAliveByDomain(i64 tabletsAliveDiff, const TSubDomainKey& objectDomain, const TSubDomainKey& tabletNodeDomain) {
+void THive::UpdateDomainTabletsAlive(const TSubDomainKey& objectDomain, i64 tabletsAliveDiff, const TSubDomainKey& tabletNodeDomain) {
     if (objectDomain) {
-        TabletsAliveByDomain[objectDomain] += tabletsAliveDiff;
-        if (objectDomain == tabletNodeDomain) {
-            TabletsAliveInObjectDomainByDomain[objectDomain] += tabletsAliveDiff;
+        Domains[objectDomain].TabletsAlive += tabletsAliveDiff;
+        if (tabletNodeDomain == objectDomain) {
+            Domains[objectDomain].TabletsAliveInObjectDomain += tabletsAliveDiff;
         }
     }
 }
diff --git a/ydb/core/mind/hive/hive_impl.h b/ydb/core/mind/hive/hive_impl.h
@@ -323,9 +323,6 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
     ui32 DataCenters = 1;
     ui32 RegisteredDataCenters = 1;
     TObjectDistributions ObjectDistributions;
-    std::unordered_map<TSubDomainKey, ui64> TabletsTotalByDomain;
-    std::unordered_map<TSubDomainKey, ui64> TabletsAliveByDomain;
-    std::unordered_map<TSubDomainKey, ui64> TabletsAliveInObjectDomainByDomain;
 
     bool AreWeRootHive() const { return RootHiveId == HiveId; }
     bool AreWeSubDomainHive() const { return RootHiveId != HiveId; }
@@ -636,8 +633,8 @@ class THive : public TActor<THive>, public TTabletExecutedFlat, public THiveShar
     TTabletCategoryInfo& GetTabletCategory(TTabletCategoryId tabletCategoryId);
     void KillNode(TNodeId nodeId, const TActorId& local);
     void AddToBootQueue(TTabletInfo* tablet);
-    void UpdateTabletsTotalByDomain(i64 tabletsTotalDiff, const TSubDomainKey& objectDomain);
-    void UpdateTabletsAliveByDomain(i64 tabletsAliveDiff, const TSubDomainKey& objectDomain, const TSubDomainKey& tabletNodeDomain);
+    void UpdateDomainTabletsTotal(const TSubDomainKey& objectDomain, i64 tabletsTotalDiff);
+    void UpdateDomainTabletsAlive(const TSubDomainKey& objectDomain, i64 tabletsAliveDiff, const TSubDomainKey& tabletNodeDomain);
     void SetCounterTabletsTotal(ui64 tabletsTotal);
     void UpdateCounterTabletsTotal(i64 tabletsTotalDiff);
     void UpdateCounterTabletsAlive(i64 tabletsAliveDiff);
diff --git a/ydb/core/mind/hive/leader_tablet_info.cpp b/ydb/core/mind/hive/leader_tablet_info.cpp
@@ -86,18 +86,18 @@ void TLeaderTabletInfo::AssignDomains(const TSubDomainKey& objectDomain, const T
     }
 
     const ui64 leaderAndFollowers = 1 + Followers.size();
-    Hive.UpdateTabletsTotalByDomain(-leaderAndFollowers, oldObjectDomain);
-    Hive.UpdateTabletsTotalByDomain(+leaderAndFollowers, ObjectDomain);
+    Hive.UpdateDomainTabletsTotal(oldObjectDomain, -leaderAndFollowers);
+    Hive.UpdateDomainTabletsTotal(ObjectDomain, +leaderAndFollowers);
 
     if (IsAlive()) {
-        Hive.UpdateTabletsAliveByDomain(-1, oldObjectDomain, Node->GetServicedDomain());
-        Hive.UpdateTabletsAliveByDomain(+1, ObjectDomain, Node->GetServicedDomain());
+        Hive.UpdateDomainTabletsAlive(oldObjectDomain, -1, Node->GetServicedDomain());
+        Hive.UpdateDomainTabletsAlive(ObjectDomain, +1, Node->GetServicedDomain());
     }
 
     for (const auto& follower : Followers) {
         if (follower.IsAlive()) {
-            Hive.UpdateTabletsAliveByDomain(-1, oldObjectDomain, follower.Node->GetServicedDomain());
-            Hive.UpdateTabletsAliveByDomain(+1, ObjectDomain, follower.Node->GetServicedDomain());
+            Hive.UpdateDomainTabletsAlive(oldObjectDomain, -1, follower.Node->GetServicedDomain());
+            Hive.UpdateDomainTabletsAlive(ObjectDomain, +1, follower.Node->GetServicedDomain());
         }
     }
 }
@@ -145,7 +145,7 @@ TFollowerTabletInfo& TLeaderTabletInfo::AddFollower(TFollowerGroup& followerGrou
         follower.Id = followerId;
     }
     Hive.UpdateCounterTabletsTotal(+1);
-    Hive.UpdateTabletsTotalByDomain(+1, ObjectDomain);
+    Hive.UpdateDomainTabletsTotal(ObjectDomain, +1);
     return follower;
 }
 
diff --git a/ydb/core/mind/hive/monitoring.cpp b/ydb/core/mind/hive/monitoring.cpp
@@ -490,18 +490,18 @@ class TTxMonEvent_MemStateDomains : public TTransactionBase<THive> {
                 out << "<td>-</td>";
                 out << "<td>-</td>";
             }
-            if (Self->TabletsTotalByDomain[domainKey] > 0) {
-                out << "<td>" << std::round(Self->TabletsAliveInObjectDomainByDomain[domainKey] * 100.0 / Self->TabletsTotalByDomain[domainKey]) << "%"
-                    << " (" << Self->TabletsAliveInObjectDomainByDomain[domainKey] << " of " << Self->TabletsTotalByDomain[domainKey] << ")" << "</td>";
+            if (domainInfo.TabletsTotal > 0) {
+                out << "<td>" << std::round(domainInfo.TabletsAliveInObjectDomain * 100.0 / domainInfo.TabletsTotal) << "%"
+                    << " (" << domainInfo.TabletsAliveInObjectDomain << " of " << domainInfo.TabletsTotal << ")" << "</td>";
 
-                const ui64 tabletsAliveInOtherDomains = Self->TabletsAliveByDomain[domainKey] - Self->TabletsAliveInObjectDomainByDomain[domainKey];
-                out << "<td>" << std::round(tabletsAliveInOtherDomains * 100.0 / Self->TabletsTotalByDomain[domainKey]) << "%"
-                    << " (" << tabletsAliveInOtherDomains << " of " << Self->TabletsTotalByDomain[domainKey] << ")" << "</td>";
+                const ui64 tabletsAliveInOtherDomains = domainInfo.TabletsAlive - domainInfo.TabletsAliveInObjectDomain;
+                out << "<td>" << std::round(tabletsAliveInOtherDomains * 100.0 / domainInfo.TabletsTotal) << "%"
+                    << " (" << tabletsAliveInOtherDomains << " of " << domainInfo.TabletsTotal << ")" << "</td>";
             } else {
                 out << "<td>-</td>";
                 out << "<td>-</td>";
             }
-            out << "<td>" << Self->TabletsTotalByDomain[domainKey] << "</td>";
+            out << "<td>" << domainInfo.TabletsTotal << "</td>";
             out << "</tr>";
         }
         out << "</tbody>";
diff --git a/ydb/core/mind/hive/node_info.cpp b/ydb/core/mind/hive/node_info.cpp
@@ -69,7 +69,7 @@ bool TNodeInfo::OnTabletChangeVolatileState(TTabletInfo* tablet, TTabletInfo::EV
         TabletsRunningByType[tablet->GetTabletType()].erase(tablet);
         TabletsOfObject[tablet->GetObjectId()].erase(tablet);
         Hive.UpdateCounterTabletsAlive(-1);
-        Hive.UpdateTabletsAliveByDomain(-1, tablet->GetLeader().ObjectDomain, GetServicedDomain());
+        Hive.UpdateDomainTabletsAlive(tablet->GetLeader().ObjectDomain, -1, GetServicedDomain());
         if (tablet->HasCounter() && tablet->IsLeader()) {
             Hive.UpdateObjectCount(tablet->AsLeader(), *this, -1);
         }
@@ -85,7 +85,7 @@ bool TNodeInfo::OnTabletChangeVolatileState(TTabletInfo* tablet, TTabletInfo::EV
         TabletsRunningByType[tablet->GetTabletType()].emplace(tablet);
         TabletsOfObject[tablet->GetObjectId()].emplace(tablet);
         Hive.UpdateCounterTabletsAlive(+1);
-        Hive.UpdateTabletsAliveByDomain(+1, tablet->GetLeader().ObjectDomain, GetServicedDomain());
+        Hive.UpdateDomainTabletsAlive(tablet->GetLeader().ObjectDomain, +1, GetServicedDomain());
         if (tablet->HasCounter() && tablet->IsLeader()) {
             Hive.UpdateObjectCount(tablet->AsLeader(), *this, +1);
         }
diff --git a/ydb/core/mind/hive/tx__load_everything.cpp b/ydb/core/mind/hive/tx__load_everything.cpp
@@ -713,10 +713,8 @@ class TTxLoadEverything : public TTransactionBase<THive> {
         ui64 tabletsTotal = 0;
         for (auto it = Self->Tablets.begin(); it != Self->Tablets.end(); ++it) {
             ++tabletsTotal;
-            Self->UpdateTabletsTotalByDomain(+1, it->second.ObjectDomain);
             for (const TTabletInfo& follower : it->second.Followers) {
                 ++tabletsTotal;
-                Self->UpdateTabletsTotalByDomain(+1, it->second.ObjectDomain);
                 if (follower.IsLeader()) {
                     follower.AsLeader();
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -1552,7 +1552,7 @@ void THive::DeleteTablet(TTabletId tabletId) {`
`1552`	`1552`	`}`
`1553`	`1553`	`const i64 tabletsTotalDiff = -1 - (tablet.Followers.size());`
`1554`	`1554`	`UpdateCounterTabletsTotal(tabletsTotalDiff);`
`1555`		`- UpdateTabletsTotalByDomain(tabletsTotalDiff, tablet.ObjectDomain);`
	`1555`	`+ UpdateDomainTabletsTotal(tablet.ObjectDomain, tabletsTotalDiff);`
`1556`	`1556`	`Tablets.erase(it);`
`1557`	`1557`	`}`
`1558`	`1558`	`}`
`@@ -1585,17 +1585,17 @@ void THive::KillNode(TNodeId nodeId, const TActorId& local) {`
`1585`	`1585`	`Execute(CreateKillNode(nodeId, local));`
`1586`	`1586`	`}`
`1587`	`1587`
`1588`		`-void THive::UpdateTabletsTotalByDomain(i64 tabletsTotalDiff, const TSubDomainKey& objectDomain) {`
	`1588`	`+void THive::UpdateDomainTabletsTotal(const TSubDomainKey& objectDomain, i64 tabletsTotalDiff) {`
`1589`	`1589`	`if (objectDomain) {`
`1590`		`- TabletsTotalByDomain[objectDomain] += tabletsTotalDiff;`
	`1590`	`+ Domains[objectDomain].TabletsTotal += tabletsTotalDiff;`
`1591`	`1591`	`}`
`1592`	`1592`	`}`
`1593`	`1593`
`1594`		`-void THive::UpdateTabletsAliveByDomain(i64 tabletsAliveDiff, const TSubDomainKey& objectDomain, const TSubDomainKey& tabletNodeDomain) {`
	`1594`	`+void THive::UpdateDomainTabletsAlive(const TSubDomainKey& objectDomain, i64 tabletsAliveDiff, const TSubDomainKey& tabletNodeDomain) {`
`1595`	`1595`	`if (objectDomain) {`
`1596`		`- TabletsAliveByDomain[objectDomain] += tabletsAliveDiff;`
`1597`		`- if (objectDomain == tabletNodeDomain) {`
`1598`		`- TabletsAliveInObjectDomainByDomain[objectDomain] += tabletsAliveDiff;`
	`1596`	`+ Domains[objectDomain].TabletsAlive += tabletsAliveDiff;`
	`1597`	`+ if (tabletNodeDomain == objectDomain) {`
	`1598`	`+ Domains[objectDomain].TabletsAliveInObjectDomain += tabletsAliveDiff;`
`1599`	`1599`	`}`
`1600`	`1600`	`}`
`1601`	`1601`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,18 +86,18 @@ void TLeaderTabletInfo::AssignDomains(const TSubDomainKey& objectDomain, const T`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`const ui64 leaderAndFollowers = 1 + Followers.size();`
`89`		`- Hive.UpdateTabletsTotalByDomain(-leaderAndFollowers, oldObjectDomain);`
`90`		`- Hive.UpdateTabletsTotalByDomain(+leaderAndFollowers, ObjectDomain);`
	`89`	`+ Hive.UpdateDomainTabletsTotal(oldObjectDomain, -leaderAndFollowers);`
	`90`	`+ Hive.UpdateDomainTabletsTotal(ObjectDomain, +leaderAndFollowers);`
`91`	`91`
`92`	`92`	`if (IsAlive()) {`
`93`		`- Hive.UpdateTabletsAliveByDomain(-1, oldObjectDomain, Node->GetServicedDomain());`
`94`		`- Hive.UpdateTabletsAliveByDomain(+1, ObjectDomain, Node->GetServicedDomain());`
	`93`	`+ Hive.UpdateDomainTabletsAlive(oldObjectDomain, -1, Node->GetServicedDomain());`
	`94`	`+ Hive.UpdateDomainTabletsAlive(ObjectDomain, +1, Node->GetServicedDomain());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`for (const auto& follower : Followers) {`
`98`	`98`	`if (follower.IsAlive()) {`
`99`		`- Hive.UpdateTabletsAliveByDomain(-1, oldObjectDomain, follower.Node->GetServicedDomain());`
`100`		`- Hive.UpdateTabletsAliveByDomain(+1, ObjectDomain, follower.Node->GetServicedDomain());`
	`99`	`+ Hive.UpdateDomainTabletsAlive(oldObjectDomain, -1, follower.Node->GetServicedDomain());`
	`100`	`+ Hive.UpdateDomainTabletsAlive(ObjectDomain, +1, follower.Node->GetServicedDomain());`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -145,7 +145,7 @@ TFollowerTabletInfo& TLeaderTabletInfo::AddFollower(TFollowerGroup& followerGrou`
`145`	`145`	`follower.Id = followerId;`
`146`	`146`	`}`
`147`	`147`	`Hive.UpdateCounterTabletsTotal(+1);`
`148`		`- Hive.UpdateTabletsTotalByDomain(+1, ObjectDomain);`
	`148`	`+ Hive.UpdateDomainTabletsTotal(ObjectDomain, +1);`
`149`	`149`	`return follower;`
`150`	`150`	`}`
`151`	`151`