Merge 6e0e960 into 58be3c4

StekPerepolnen · web-flow · commit 7969151a05bb · 2024-06-11T15:22:43.000Z
diff --git a/ydb/core/grpc_services/db_metadata_cache.h b/ydb/core/grpc_services/db_metadata_cache.h
@@ -60,6 +60,7 @@ class TDatabaseMetadataCache : public TActorBootstrapped<TDatabaseMetadataCache>
         auto request = std::make_unique<NHealthCheck::TEvSelfCheckRequest>();
         request->Database = Path;
         request->Request.set_return_verbose_status(true);
+        request->Request.set_merge_records(true);
         Send(NHealthCheck::MakeHealthCheckID(), request.release());
         Counters->GetCounter(HEALTHCHECK_REQUESTS_MADE_COUNTER, true)->Inc();
     }
diff --git a/ydb/core/grpc_services/rpc_monitoring.cpp b/ydb/core/grpc_services/rpc_monitoring.cpp
@@ -44,7 +44,7 @@ class TSelfCheckRPC : public TRpcRequestActor<TSelfCheckRPC, TEvSelfCheckRequest
     }
 
     void Bootstrap() {
-        if (GetProtoRequest()->do_not_cache() || !Request->GetDatabaseName()) {
+        if (GetProtoRequest()->do_not_cache() || !Request->GetDatabaseName() || !GetProtoRequest()->merge_records()) {
             SendHealthCheckRequest();
         } else {
             RegisterWithSameMailbox(CreateBoardLookupActor(MakeDatabaseMetadataCacheBoardPath(Request->GetDatabaseName().GetRef()),

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ class TDatabaseMetadataCache : public TActorBootstrapped<TDatabaseMetadataCache>`
`60`	`60`	`auto request = std::make_unique<NHealthCheck::TEvSelfCheckRequest>();`
`61`	`61`	`request->Database = Path;`
`62`	`62`	`request->Request.set_return_verbose_status(true);`
	`63`	`+ request->Request.set_merge_records(true);`
`63`	`64`	`Send(NHealthCheck::MakeHealthCheckID(), request.release());`
`64`	`65`	`Counters->GetCounter(HEALTHCHECK_REQUESTS_MADE_COUNTER, true)->Inc();`
`65`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class TSelfCheckRPC : public TRpcRequestActor<TSelfCheckRPC, TEvSelfCheckRequest`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`void Bootstrap() {`
`47`		`- if (GetProtoRequest()->do_not_cache() \|\| !Request->GetDatabaseName()) {`
	`47`	`+ if (GetProtoRequest()->do_not_cache() \|\| !Request->GetDatabaseName() \|\| !GetProtoRequest()->merge_records()) {`
`48`	`48`	`SendHealthCheckRequest();`
`49`	`49`	`} else {`
`50`	`50`	`RegisterWithSameMailbox(CreateBoardLookupActor(MakeDatabaseMetadataCacheBoardPath(Request->GetDatabaseName().GetRef()),`