Skip to content

Commit 5849289

Browse files
authored
Fix gRPC server runner (merge from main #25700) (#25735)
2 parents 4f24a5f + f89d980 commit 5849289

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

ydb/core/driver_lib/run/run.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,7 +1990,9 @@ void TKikimrRunner::KikimrStart() {
19901990
Monitoring->Start(ActorSystem.Get());
19911991
}
19921992

1993-
GRpcServersManager = ActorSystem->Register(new TGRpcServersManager(std::move(GRpcServersFactory), ProcessMemoryInfoProvider));
1993+
if (GRpcServersFactory) {
1994+
GRpcServersManager = ActorSystem->Register(new TGRpcServersManager(std::move(GRpcServersFactory), ProcessMemoryInfoProvider));
1995+
}
19941996

19951997
if (SqsHttp) {
19961998
SqsHttp->Start();
@@ -2095,9 +2097,11 @@ void TKikimrRunner::KikimrStop(bool graceful) {
20952097
}
20962098

20972099
// stop processing grpc requests/response - we must stop feeding ActorSystem
2098-
TManualEvent event;
2099-
ActorSystem->Send(new IEventHandle(GRpcServersManager, {}, new TGRpcServersManager::TEvStop(&event)));
2100-
event.WaitI();
2100+
if (GRpcServersManager) {
2101+
TManualEvent event;
2102+
ActorSystem->Send(new IEventHandle(GRpcServersManager, {}, new TGRpcServersManager::TEvStop(&event)));
2103+
event.WaitI();
2104+
}
21012105

21022106
if (ActorSystem) {
21032107
ActorSystem->Stop();

0 commit comments

Comments
 (0)