Merge bd897fb into 4c79b47

Author: nshestakov

ydb/core/persqueue/read_balancer__balancing.cpp

@@ -341,7 +341,7 @@ void TPartitionFamily::AttachePartitions(const std::vector<ui32>& partitions, co
     }
 
     auto [activePartitionCount, inactivePartitionCount] = ClassifyPartitions(newPartitions);
-    ChangePartitionCounters(activePartitionCount, activePartitionCount);
+    ChangePartitionCounters(activePartitionCount, inactivePartitionCount);
 
     if (IsActive()) {
         if (!Session->AllPartitionsReadable(newPartitions)) {
@@ -734,7 +734,11 @@ bool TConsumer::BreakUpFamily(TPartitionFamily* family, ui32 partitionId, bool d
                     f->Session->Families.try_emplace(f->Id, f);
                     if (f->IsActive()) {
                         ++f->Session->ActiveFamilyCount;
+                    } else if (f->IsRelesing()) {
+                        ++f->Session->ReleasingFamilyCount;
                     }
+                    f->Session->ActivePartitionCount += f->ActivePartitionCount;
+                    f->Session->InactivePartitionCount += f->InactivePartitionCount;
                 }
 
                 newFamilies.push_back(f);

ydb/core/persqueue/read_balancer__balancing_app.cpp

@@ -171,8 +171,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
                         TABLEH() { }
                         TABLEH() { str << "Id"; }
                         TABLEH() { str << "Partitions"; }
-                        TABLEH() { str << "<span alt=\"All / Active / Releasing\">Families</span>"; }
-                        TABLEH() { str << "<span alt=\"Active / Inactive / Releasing\">Statistics</span>"; };
+                        TABLEH() { str << "<span title=\"All families / Active / Releasing\">Families</span>"; }
+                        TABLEH() { str << "<span title=\"All partitions / Active / Inactive / Releasing\">Statistics</span>"; };
                         TABLEH() { str << "Client node"; }
                         TABLEH() { str << "Proxy node"; }
                     }
@@ -203,7 +203,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
                             TABLED() { str << session->SessionName; }
                             TABLED() { str << (session->Partitions.empty() ? "" : JoinRange(", ", session->Partitions.begin(), session->Partitions.end())); }
                             TABLED() { str << session->Families.size() << " / " << session->ActiveFamilyCount << " / " << session->ReleasingFamilyCount; }
-                            TABLED() { str << session->ActivePartitionCount << " / " << session->InactivePartitionCount << " / " << session->ReleasingPartitionCount; }
+                            TABLED() { str << (session->ActivePartitionCount + session->InactivePartitionCount) << " / " << session->ActivePartitionCount
+                                           << " / " << session->InactivePartitionCount << " / " << session->ReleasingPartitionCount; }
                             TABLED() { str << session->ClientNode; }
                             TABLED() { str << session->ProxyNodeId; }
                         }
@@ -213,7 +214,8 @@ void TBalancer::RenderApp(TStringStream& str) const {
                         TABLED() { str << "<strong>Total:</strong>"; }
                         TABLED() { }
                         TABLED() { str << familyAllCount << " / " << activeFamilyCount << " / " << releasingFamilyCount; }
-                        TABLED() { str << activePartitionCount << " / " << inactivePartitionCount << " / " << releasingPartitionCount; }
+                        TABLED() { str << (activePartitionCount + inactivePartitionCount) << " / " << activePartitionCount << " / " << inactivePartitionCount
+                                       << " / " << releasingPartitionCount; }
                         TABLED() { }
                         TABLED() { }
                     }