Skip to content

Commit a857e10

Browse files
remove AuthenticGroups
1 parent c4ce41e commit a857e10

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ydb/core/health_check/health_check.cpp

+5-7
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
222222
TString Name;
223223
TString Kind;
224224
THashSet<TGroupId> Groups;
225-
THashSet<TGroupId> AuthenticGroups;
226225
};
227226

228227
struct TDatabaseState {
@@ -878,15 +877,17 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
878877
if (ev->Get()->GetRecord().status() == NKikimrScheme::StatusSuccess) {
879878
TString path = ev->Get()->GetRecord().path();
880879
TDatabaseState& state(DatabaseState[path]);
880+
Cerr << "AAAAA TEvDescribeSchemeResult path " << path << Endl;
881881
for (const auto& storagePool : ev->Get()->GetRecord().pathdescription().domaindescription().storagepools()) {
882-
// no poolId here, so it's neccesary to keep poolNames until AggregateBSControllerState()
883882
TString storagePoolName = storagePool.name();
884883
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
886885
}
887886
if (path == DomainPath) {
888887
state.StoragePools.emplace(0); // static group has poolId = 0
889888
}
889+
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageUsage " << state.StorageUsage << path << Endl;
890+
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageQuota " << state.StorageQuota << path << Endl;
890891
state.StorageUsage = ev->Get()->GetRecord().pathdescription().domaindescription().diskspaceusage().tables().totalsize();
891892
state.StorageQuota = ev->Get()->GetRecord().pathdescription().domaindescription().databasequotas().data_size_hard_quota();
892893

@@ -1110,7 +1111,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
11101111
Cerr << "AAAAA poolId " << group.GetStoragePoolId() << Endl;
11111112
BSConfigGroups.emplace(groupId, &group);
11121113
StoragePoolState[poolId].Groups.emplace(group.groupid());
1113-
StoragePoolState[poolId].AuthenticGroups.emplace(group.groupid());
11141114
}
11151115
for (const NKikimrBlobStorage::TBaseConfig::TNode& node : pbConfig.GetNode()) {
11161116
auto nodeId = node.GetNodeId();
@@ -2008,9 +2008,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
20082008
Cerr << "iiiii poolId " << poolId << Endl;
20092009
auto itStoragePoolState = StoragePoolState.find(poolId);
20102010
if (itStoragePoolState != StoragePoolState.end()) {
2011-
if (!itStoragePoolState->second.AuthenticGroups.empty()) {
2012-
itStoragePoolState->second.Groups = itStoragePoolState->second.AuthenticGroups;
2013-
}
20142011
FillPoolStatus(itStoragePoolState->second, *storageStatus.add_pools(), {&context, "STORAGE_POOL"});
20152012
StoragePoolSeen.emplace(poolId);
20162013
}
@@ -2161,6 +2158,7 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
21612158
FillDatabaseResult(context, FilterDatabase, DatabaseState[FilterDatabase]);
21622159
} else {
21632160
for (auto& [path, state] : DatabaseState) {
2161+
Cerr << "OOO path " << path << Endl;
21642162
FillDatabaseResult(context, path, state);
21652163
}
21662164
}

0 commit comments

Comments
 (0)