@@ -222,7 +222,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
222
222
TString Name;
223
223
TString Kind;
224
224
THashSet<TGroupId> Groups;
225
- THashSet<TGroupId> AuthenticGroups;
226
225
};
227
226
228
227
struct TDatabaseState {
@@ -878,15 +877,17 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
878
877
if (ev->Get ()->GetRecord ().status () == NKikimrScheme::StatusSuccess) {
879
878
TString path = ev->Get ()->GetRecord ().path ();
880
879
TDatabaseState& state (DatabaseState[path]);
880
+ Cerr << " AAAAA TEvDescribeSchemeResult path " << path << Endl;
881
881
for (const auto & storagePool : ev->Get ()->GetRecord ().pathdescription ().domaindescription ().storagepools ()) {
882
- // no poolId here, so it's neccesary to keep poolNames until AggregateBSControllerState()
883
882
TString storagePoolName = storagePool.name ();
884
883
Cerr << " AAAAA TEvDescribeSchemeResult storagePoolName " << storagePoolName << Endl;
885
- PathsByPoolName[storagePoolName].emplace (path);
884
+ PathsByPoolName[storagePoolName].emplace (path); // no poolId in TEvDescribeSchemeResult, so it's neccesary to keep poolNames instead
886
885
}
887
886
if (path == DomainPath) {
888
887
state.StoragePools .emplace (0 ); // static group has poolId = 0
889
888
}
889
+ Cerr << " AAAAA TEvDescribeSchemeResult state.StorageUsage " << state.StorageUsage << path << Endl;
890
+ Cerr << " AAAAA TEvDescribeSchemeResult state.StorageQuota " << state.StorageQuota << path << Endl;
890
891
state.StorageUsage = ev->Get ()->GetRecord ().pathdescription ().domaindescription ().diskspaceusage ().tables ().totalsize ();
891
892
state.StorageQuota = ev->Get ()->GetRecord ().pathdescription ().domaindescription ().databasequotas ().data_size_hard_quota ();
892
893
@@ -1110,7 +1111,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
1110
1111
Cerr << " AAAAA poolId " << group.GetStoragePoolId () << Endl;
1111
1112
BSConfigGroups.emplace (groupId, &group);
1112
1113
StoragePoolState[poolId].Groups .emplace (group.groupid ());
1113
- StoragePoolState[poolId].AuthenticGroups .emplace (group.groupid ());
1114
1114
}
1115
1115
for (const NKikimrBlobStorage::TBaseConfig::TNode& node : pbConfig.GetNode ()) {
1116
1116
auto nodeId = node.GetNodeId ();
@@ -2008,9 +2008,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
2008
2008
Cerr << " iiiii poolId " << poolId << Endl;
2009
2009
auto itStoragePoolState = StoragePoolState.find (poolId);
2010
2010
if (itStoragePoolState != StoragePoolState.end ()) {
2011
- if (!itStoragePoolState->second .AuthenticGroups .empty ()) {
2012
- itStoragePoolState->second .Groups = itStoragePoolState->second .AuthenticGroups ;
2013
- }
2014
2011
FillPoolStatus (itStoragePoolState->second , *storageStatus.add_pools (), {&context, " STORAGE_POOL" });
2015
2012
StoragePoolSeen.emplace (poolId);
2016
2013
}
@@ -2161,6 +2158,7 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
2161
2158
FillDatabaseResult (context, FilterDatabase, DatabaseState[FilterDatabase]);
2162
2159
} else {
2163
2160
for (auto & [path, state] : DatabaseState) {
2161
+ Cerr << " OOO path " << path << Endl;
2164
2162
FillDatabaseResult (context, path, state);
2165
2163
}
2166
2164
}
0 commit comments