Skip to content

Commit 7e4c254

Browse files
StekPerepolnenStekPerepolnen
committed
remove comments
1 parent a857e10 commit 7e4c254

File tree

2 files changed

+87
-159
lines changed

2 files changed

+87
-159
lines changed

‎ydb/core/health_check/health_check.cpp

+23-59
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
232232
THashMap<std::pair<TTabletId, NNodeWhiteboard::TFollowerId>, const NKikimrHive::TTabletInfo*> MergedTabletState;
233233
THashMap<TNodeId, TNodeTabletState> MergedNodeTabletState;
234234
THashMap<TNodeId, ui32> NodeRestartsPerPeriod;
235-
ui64 StorageQuota;
236-
ui64 StorageUsage;
235+
ui64 StorageQuota = 0;
236+
ui64 StorageUsage = 0;
237237
TMaybeServerlessComputeResourcesMode ServerlessComputeResourcesMode;
238238
};
239239

@@ -534,6 +534,10 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
534534
}
535535

536536
void Bootstrap() {
537+
Cerr << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< " << Endl;
538+
Cerr << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< " << Endl;
539+
Cerr << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< " << Endl;
540+
Cerr << "!!!!!!!!!!!!!!! Bootstrap() " << Endl;
537541
FilterDatabase = Request->Database;
538542
if (Request->Request.operation_params().has_operation_timeout()) {
539543
Timeout = GetDuration(Request->Request.operation_params().operation_timeout());
@@ -585,38 +589,10 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
585589

586590
Send(GetNameserviceActorId(), new TEvInterconnect::TEvListNodes());
587591
++Requests;
588-
// Send(MakeBlobStorageNodeWardenID(SelfId().NodeId()), new TEvNodeWardenQueryStorageConfig(false));
589-
// ++Requests;
590592

591593
Become(&TThis::StateWait, Timeout, new TEvents::TEvWakeup());
592594
}
593595

594-
// void Handle(TEvNodeWardenStorageConfig::TPtr ev) {
595-
// Cerr << "iiiiii TEvNodeWardenStorageConfig " << Endl;
596-
// if (const NKikimrBlobStorage::TStorageConfig& config = *ev->Get()->Config; config.HasBlobStorageConfig()) {
597-
// if (const auto& bsConfig = config.GetBlobStorageConfig(); bsConfig.HasServiceSet()) {
598-
// const auto& staticConfig = bsConfig.GetServiceSet();
599-
// for (const NKikimrBlobStorage::TNodeWardenServiceSet_TPDisk& pDisk : staticConfig.pdisks()) {
600-
// RequestStorageNode(pDisk.GetNodeID());
601-
// }
602-
// Cerr << "iiiiii staticConfig.groups().size() " << staticConfig.groups().size() << Endl;
603-
// for (const NKikimrBlobStorage::TGroupInfo& group : staticConfig.groups()) {
604-
// ValidGroups.emplace(group.GetGroupID());
605-
// TString storagePoolName = group.GetStoragePoolName();
606-
// if (!storagePoolName) {
607-
// storagePoolName = STATIC_STORAGE_POOL_NAME;
608-
// }
609-
// StoragePoolState[storagePoolName].Groups.emplace(group.groupid());
610-
// if (!IsSpecificDatabaseFilter()) {
611-
// DatabaseState[DomainPath].StoragePoolNames.emplace(storagePoolName);
612-
// }
613-
// }
614-
// }
615-
// }
616-
617-
// RequestDone("TEvNodeWardenStorageConfig");
618-
// }
619-
620596
STATEFN(StateWait) {
621597
switch (ev->GetTypeRewrite()) {
622598
hFunc(TEvents::TEvUndelivered, Handle);
@@ -628,24 +604,24 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
628604
hFunc(TEvHive::TEvResponseHiveInfo, Handle);
629605
hFunc(NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult, Handle);
630606
hFunc(TEvTxProxySchemeCache::TEvNavigateKeySetResult, Handle)
631-
//hFunc(TEvBlobStorage::TEvControllerSelectGroupsResult, Handle);
632607
hFunc(TEvBlobStorage::TEvControllerConfigResponse, Handle);
633608
hFunc(NNodeWhiteboard::TEvWhiteboard::TEvSystemStateResponse, Handle);
634609
hFunc(TEvInterconnect::TEvNodeDisconnected, Disconnected);
635610
hFunc(TEvTabletPipe::TEvClientDestroyed, Handle);
636611
hFunc(TEvTabletPipe::TEvClientConnected, Handle);
637612
hFunc(TEvPrivate::TEvRetryNodeWhiteboard, Handle);
638613
cFunc(TEvents::TSystem::Wakeup, HandleTimeout);
639-
//hFunc(TEvNodeWardenStorageConfig, Handle);
640614
}
641615
}
642616

643617
void RequestDone(const char* name) {
644618
--Requests;
619+
Cerr << " Requests " << Requests << Endl;
645620
if (Requests == 0) {
646621
ReplyAndPassAway();
647622
}
648623
if (Requests < 0) {
624+
Cerr << " OOOOOPS!!!!!!!! " << Endl;
649625
BLOG_CRIT("Requests < 0 in RequestDone(" << name << ")");
650626
}
651627
}
@@ -703,13 +679,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
703679
RequestTabletPipe(ConsoleId, "TEvListTenantsRequest", request.Release());
704680
}
705681

706-
// void RequestSelectGroups(const TString& storagePoolName) {
707-
// THolder<TEvBlobStorage::TEvControllerSelectGroups> request = MakeHolder<TEvBlobStorage::TEvControllerSelectGroups>();
708-
// request->Record.SetReturnAllMatchingGroups(true);
709-
// request->Record.AddGroupParameters()->MutableStoragePoolSpecifier()->SetName(storagePoolName);
710-
// RequestTabletPipe(BsControllerId, "TEvControllerSelectGroups:" + storagePoolName, request.Release());
711-
// }
712-
713682
void RequestConfig() {
714683
Cerr << "iiiiiii RequestConfig " << Endl;
715684
THolder<TEvBlobStorage::TEvControllerConfigRequest> request = MakeHolder<TEvBlobStorage::TEvControllerConfigRequest>();
@@ -820,6 +789,7 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
820789
}
821790

822791
void HandleTimeout() {
792+
Cerr << "!!!!!!!!!!!!!!! ReplyAndPassAway() " << Endl;
823793
ReplyAndPassAway();
824794
}
825795

@@ -853,25 +823,13 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
853823
Cerr << "iiiii 1" << Endl;
854824
const NKikimrBlobStorage::TConfigResponse::TStatus& pbStatus(pbRecord.GetResponse().GetStatus(0));
855825
if (pbStatus.HasBaseConfig()) {
856-
Cerr << "iiiii BaseConfig";
826+
Cerr << "iiiii BaseConfig" << Endl;
857827
BaseConfig = ev->Release();
858828
}
859829
}
860830
RequestDone("TEvControllerConfigResponse");
861831
}
862832

863-
// void Handle(TEvBlobStorage::TEvControllerSelectGroupsResult::TPtr& ev) {
864-
// TabletRequests.CompleteRequest(ev->Cookie);
865-
// for (const auto& matchingGroups : ev->Get()->Record.matchinggroups()) {
866-
// for (const auto& group : matchingGroups.groups()) {
867-
// TString storagePoolName = group.storagepoolname();
868-
// StoragePoolState[storagePoolName].Groups.emplace(group.groupid());
869-
// StoragePoolState[storagePoolName].AuthenticGroups.emplace(group.groupid());
870-
// }
871-
// }
872-
// RequestDone("TEvControllerSelectGroupsResult");
873-
// }
874-
875833
void Handle(NSchemeShard::TEvSchemeShard::TEvDescribeSchemeResult::TPtr& ev) {
876834
TabletRequests.CompleteRequest(ev->Cookie);
877835
if (ev->Get()->GetRecord().status() == NKikimrScheme::StatusSuccess) {
@@ -880,16 +838,19 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
880838
Cerr << "AAAAA TEvDescribeSchemeResult path " << path << Endl;
881839
for (const auto& storagePool : ev->Get()->GetRecord().pathdescription().domaindescription().storagepools()) {
882840
TString storagePoolName = storagePool.name();
841+
if (!storagePoolName) {
842+
storagePoolName = STATIC_STORAGE_POOL_NAME;
843+
}
883844
Cerr << "AAAAA TEvDescribeSchemeResult storagePoolName " << storagePoolName << Endl;
884845
PathsByPoolName[storagePoolName].emplace(path); // no poolId in TEvDescribeSchemeResult, so it's neccesary to keep poolNames instead
885846
}
886847
if (path == DomainPath) {
887848
state.StoragePools.emplace(0); // static group has poolId = 0
888849
}
889-
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageUsage " << state.StorageUsage << path << Endl;
890-
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageQuota " << state.StorageQuota << path << Endl;
891850
state.StorageUsage = ev->Get()->GetRecord().pathdescription().domaindescription().diskspaceusage().tables().totalsize();
892851
state.StorageQuota = ev->Get()->GetRecord().pathdescription().domaindescription().databasequotas().data_size_hard_quota();
852+
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageUsage " << state.StorageUsage << path << Endl;
853+
Cerr << "AAAAA TEvDescribeSchemeResult state.StorageQuota " << state.StorageQuota << path << Endl;
893854

894855
DescribeByPath[path] = ev->Release();
895856
}
@@ -1121,14 +1082,15 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
11211082
for (const NKikimrBlobStorage::TDefineStoragePool& pool : spStatus.GetStoragePool()) {
11221083
ui64 poolId = pool.GetStoragePoolId();
11231084
TString storagePoolName = pool.GetName();
1124-
Cerr << "iiiiiii pool storagePoolName " << storagePoolName << Endl;
11251085
if (!storagePoolName) {
11261086
storagePoolName = STATIC_STORAGE_POOL_NAME;
11271087
}
1088+
Cerr << "zzzzzz pool storagePoolName " << storagePoolName << Endl;
11281089
StoragePoolState[poolId].Name = storagePoolName;
11291090
StoragePoolState[poolId].Kind = pool.GetKind();
11301091

11311092
for (const TString& path : PathsByPoolName[storagePoolName]) {
1093+
Cerr << "zzzzzzz path " << path << Endl;
11321094
DatabaseState[path].StoragePools.emplace(poolId);
11331095
}
11341096
if (!IsSpecificDatabaseFilter()) {
@@ -1401,10 +1363,6 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
14011363
return TStringBuilder() << vSlot.vslotid().nodeid() << "-" << vSlot.vslotid().pdiskid();
14021364
}
14031365

1404-
// static TString GetPDiskId(const NKikimrBlobStorage::TNodeWardenServiceSet_TPDisk& pDisk) {
1405-
// return TStringBuilder() << pDisk.nodeid() << "-" << pDisk.pdiskid();
1406-
// }
1407-
14081366
void FillPDiskStatus(const TString& pDiskId, Ydb::Monitoring::StoragePDiskStatus& storagePDiskStatus, TSelfCheckContext context) {
14091367
context.Location.clear_database(); // PDisks are shared between databases
14101368
context.Location.mutable_storage()->mutable_pool()->clear_name(); // PDisks are shared between pools
@@ -2027,6 +1985,8 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
20271985
break;
20281986
}
20291987
}
1988+
Cerr << "SSSSSSSSSSSS databaseState.StorageUsage " << databaseState.StorageUsage << Endl;
1989+
Cerr << "SSSSSSSSSSSS databaseState.StorageQuota " << databaseState.StorageQuota << Endl;
20301990
if (databaseState.StorageQuota > 0) {
20311991
auto usage = (float)databaseState.StorageUsage / databaseState.StorageQuota;
20321992
if (usage > 0.9) {
@@ -2176,11 +2136,14 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
21762136
if (!FilterDatabase) {
21772137
TDatabaseState unknownDatabase;
21782138
for (auto& [id, pool] : StoragePoolState) {
2139+
Cerr << "iiiiiiiiiii check poolId" << id << " pool.Name " << pool.Name << Endl;
21792140
if (StoragePoolSeen.count(id) == 0) {
2141+
Cerr << "iiiiiiiiiii unknownDatabase poolId" << id << " pool.Name " << pool.Name << Endl;
21802142
unknownDatabase.StoragePools.insert(id);
21812143
}
21822144
}
21832145
if (!unknownDatabase.StoragePools.empty()) {
2146+
Cerr << "iiiiiiiiiii unknownDatabase not empty" << Endl;
21842147
Ydb::Monitoring::DatabaseStatus& databaseStatus(*context.Result->add_database_status());
21852148
TSelfCheckResult storageContext;
21862149
FillStorage(unknownDatabase, *databaseStatus.mutable_storage(), {&storageContext, "STORAGE"});
@@ -2230,6 +2193,7 @@ class TSelfCheckRequest : public TActorBootstrapped<TSelfCheckRequest> {
22302193
}
22312194

22322195
void ReplyAndPassAway() {
2196+
Cerr << "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< " << Endl;
22332197
THolder<TEvSelfCheckResult> response = MakeHolder<TEvSelfCheckResult>();
22342198
Ydb::Monitoring::SelfCheckResult& result = response->Result;
22352199

0 commit comments

Comments
 (0)